Skip to content

Commit

Permalink
NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-17-183402_amd64-2024-0…
Browse files Browse the repository at this point in the history 
…7-17_arm64-2024-07-18 (#3660)

* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <ci-robot@openshift.io>
  • Loading branch information
@microshift-rebase-script
microshift-rebase-script[bot] and ci-robot committed Jul 19, 2024
1 parent ebb279f commit dcc3c9d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-17-195551
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-07-18-202732
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-17-195551"
"base": "4.17.0-0.nightly-arm64-2024-07-18-202732"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b9f3ed107b736e87a74b8f9f2d9c98ef022f4e599ba1475a10816c00b528a81",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-17-195551"
"base": "4.17.0-0.nightly-arm64-2024-07-18-202732"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35db4a46560ab61702891aad9c8905cef0b389fa3f7561537e7b76b85c4c7c06",
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-07-17-195551"
"base": "4.17.0-0.nightly-arm64-2024-07-18-202732"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a5ff0ab1bb3e344914ad50de86ea858e17cac24da5bbc061be287b46046760a",
Expand All @@ -9,15 +9,15 @@
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e0d2b4b07dd3f2ea4171e30838036f76f81c53a6264056ad8152355765d3872",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56d3a1e014dc92149acf5beee82933c9914c87563ee98f26936e601975957455",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc70e75bab33fcbb7cdc7cf3026e723728b63ff5243365f4822af890d3f2dc62",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbbf753d670010dd8cafeb2345e70b22540c9ee3cdf702d8746b4438fd798352",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ff7539db47ad662df593fc13c4a95d73f4dc603e8743760063de1367725a731",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0498501ba0821dc73defce9e79f801c2281b4aefb0de4eba36415c7e84fc9eeb",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9547a11e31cd266f18df598c36ccd4d0be976c47d92334d8df4c08279e43d5b3",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:155f35aa8ef4f224e9ffd146f7664b94a97db36a1259d3ec275f6bf28780ed94"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40fa01086913c4b228be89f695298d6cbb51ae3fb95b0f56c24b7a716d793ea3",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a2bd5917d1a3b7d9b24c9708ff91949b0aea839a2917dcd41a5ebc340fb577",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d17833b85dcd3ec8cb51446b4591a6ab93026b2bc51294e2052e329029eb6d91"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc70e75bab33fcbb7cdc7cf3026e723728b63ff5243365f4822af890d3f2dc62"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbbf753d670010dd8cafeb2345e70b22540c9ee3cdf702d8746b4438fd798352"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
41 changes: 12 additions & 29 deletions scripts/auto-rebase/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,16 @@
- cluster-network-operator embedded-component 1cd8678b38fb0b7ac51fae98fc512e7224bc5965 to 116a2c713beb4689b3a1df80e6e898cc2733b3fb
- 0be5bd9 2024-07-16T09:55:17+02:00 Enable TechPreview FeatureGate for NetworkSegmentation
- csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512
- 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml
- 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml

- csi-external-snapshotter embedded-component 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml
- csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512
- 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml
- 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml

- kubernetes embedded-component b9176556cda6da83643241a8eadbefd79fa50151 to e34cf927edb7321aac8e69ac9b8849fb831a8cfe
- 2c16ab44d 2024-07-16T11:31:06-05:00 UPSTREAM: 125404: Fix that PodIP field is temporarily removed for a terminal pod
- csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b to 6ae55b8749a2fd9011d2c75d5f428f36e93be512
- 5af999d 2024-07-12T19:32:34+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-snapshot-controller.yml
- 70b4688 2024-07-12T19:02:23+00:00 UPSTREAM: <carry>: Updating ose-csi-snapshot-validation-webhook-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/csi-snapshot-validation-webhook.yml

- csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- kubernetes image-amd64 b9176556cda6da83643241a8eadbefd79fa50151 to e34cf927edb7321aac8e69ac9b8849fb831a8cfe
- 2c16ab44d 2024-07-16T11:31:06-05:00 UPSTREAM: 125404: Fix that PodIP field is temporarily removed for a terminal pod

- csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 to a58f2cd35a2623d83179e9558a04a3094c694f4b
- d20ba4f 2024-07-12T16:42:23+00:00 UPSTREAM: <carry>: Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/81a28f96d18bca14030c8f73664a9c230858fb03/images/ose-csi-external-snapshotter.yml

- kubernetes image-arm64 b9176556cda6da83643241a8eadbefd79fa50151 to e34cf927edb7321aac8e69ac9b8849fb831a8cfe
- 2c16ab44d 2024-07-16T11:31:06-05:00 UPSTREAM: 125404: Fix that PodIP field is temporarily removed for a terminal pod
- kubernetes image-arm64 e34cf927edb7321aac8e69ac9b8849fb831a8cfe to 1bead22a2ef091d421bbe4e455799fac869c3c80
- a1eaa95fe 2024-07-15T16:39:34-03:00 UPSTREAM: <carry>: add tool to validate test packages imported
- 092eb800a 2024-07-11T12:53:19+02:00 UPSTREAM: <carry>: sync imports and update test rules

8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ https://github.com/openshift/kubernetes image-amd64 e34cf927edb7321aac8e69ac9b88
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 1127650882a9e42d059dca74c21915155afaeb2e
https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d
https://github.com/openshift/csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b
https://github.com/openshift/csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b
https://github.com/openshift/csi-external-snapshotter image-arm64 a58f2cd35a2623d83179e9558a04a3094c694f4b
https://github.com/openshift/csi-external-snapshotter image-arm64 6ae55b8749a2fd9011d2c75d5f428f36e93be512
https://github.com/openshift/csi-external-snapshotter image-arm64 6ae55b8749a2fd9011d2c75d5f428f36e93be512
https://github.com/openshift/csi-external-snapshotter image-arm64 6ae55b8749a2fd9011d2c75d5f428f36e93be512
https://github.com/openshift/router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534
https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-arm64 9168abf8a94cbd83a7fd53fc675fb42afea870ea
https://github.com/openshift/kubernetes image-arm64 e34cf927edb7321aac8e69ac9b8849fb831a8cfe
https://github.com/openshift/kubernetes image-arm64 1bead22a2ef091d421bbe4e455799fac869c3c80
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-17-183402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-17-195551"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-07-17-183402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-07-18-202732"

0 comments on commit dcc3c9d

Please sign in to comment.