diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 3ee21d3e75..122a7c406e 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-05-30-165837 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-02-224131 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 8f3ea8c880..544017abdc 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-05-30-165837" + "base": "4.17.0-0.nightly-arm64-2024-06-02-224131" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:784ffaf9726c83ff250cdba0952745f9dcd32a8c76642aea6b8a469578921df3", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index d207f448d3..29623b53a5 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5afb8472e8356087e21d070744aa99adfc55494a046f207ed7f2132d44afe56a + digest: sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cfc4946a02d55accb1c2c1aabd9372cf235fb6135259ac0d0a8ff5d5af4b1816 + digest: sha256:874e8cf4e3a08066b998c4fc3cb4b6d8cdcbbb4224a0c966fa1fc0b132fec233 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:f6bd6e3d67da49b1205f3c76e3783d1e9f0ff7b55bff9d6a6f1a7504b8717ecd @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfc4946a02d55accb1c2c1aabd9372cf235fb6135259ac0d0a8ff5d5af4b1816 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:874e8cf4e3a08066b998c4fc3cb4b6d8cdcbbb4224a0c966fa1fc0b132fec233 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5afb8472e8356087e21d070744aa99adfc55494a046f207ed7f2132d44afe56a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 44700afea4..d7bc34346b 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-05-30-165837" + "base": "4.17.0-0.nightly-arm64-2024-06-02-224131" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5afb8472e8356087e21d070744aa99adfc55494a046f207ed7f2132d44afe56a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfc4946a02d55accb1c2c1aabd9372cf235fb6135259ac0d0a8ff5d5af4b1816", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b13cf2ff7feeab314f8a6a61d7518e7f5bfbfdd344bda075bd824c8ffae38be", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:874e8cf4e3a08066b998c4fc3cb4b6d8cdcbbb4224a0c966fa1fc0b132fec233", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6bd6e3d67da49b1205f3c76e3783d1e9f0ff7b55bff9d6a6f1a7504b8717ecd" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e92a035774..d94a2617a9 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-05-30-165837" + "base": "4.17.0-0.nightly-arm64-2024-06-02-224131" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff1e3d17144667998f93cb094849182e5da20976681330f5ab2b6365d8dbae9a", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40d3fe3e0988d8ab81c8d48d8395647e1339772e8f7e415f81b2741cddee5d4b", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d31d0d5a0225cea151fd0caaaf945ff09460bacdcd3c8078aeb3b9340a749f14", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db37ca0409e0001765416949466017da80977513846f5e398dffa266e82a16c1", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6bd6e3d67da49b1205f3c76e3783d1e9f0ff7b55bff9d6a6f1a7504b8717ecd", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index fac2bf49de..6c31d8c8c2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,14 +1,6 @@ -- oc image-arm64 a5a43b9e6407f8ddf4a73fe995c5eca75a9ac5ab to d5b5b3a62fa4743a9e7a9cd4779b08d7f3e58c31 - - 51487f9a 2024-05-29T16:22:12+02:00 inspectalerts: refactor `getWithBearer` to try all urls in route - - 2715cc4f 2024-05-29T15:42:11+02:00 inspectalerts: use client-go wrappers for thanos call debugging - - 518c0e77 2024-05-29T15:38:59+02:00 OCPBUGS-33896: `status/inspect-alerts`: handle non-200 by Thanos - -- coredns image-arm64 4989dc716d946d61642989412fe3f4f92bc28bad to 4a14f3481105adf4b4086ba9727bee3dec0847fd - - 2637e65 2024-05-25T03:47:02+00:00 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/coredns.yml - -- kubernetes image-arm64 f1cd924886037a20bc23538a5d146b5cb43245e1 to 9798e1912b073aadb7551210381cb2c1e7020bd1 - - 26f5de0b5 2024-05-29T16:16:20+02:00 UPSTREAM: 124933: [Scheduler] Use allNodes when calculating nextStartNodeIndex - - c54d78f1d 2024-05-29T15:31:16+02:00 UPSTREAM: : skip PodLifecycleSleepAction test - - 07f0c6196 2024-05-29T11:01:42+02:00 UPSTREAM: : skip storage tests - - 518f920b9 2024-04-16T10:47:53-04:00 UPSTREAM: : extend termination events +- oc image-arm64 d5b5b3a62fa4743a9e7a9cd4779b08d7f3e58c31 to 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2 + - 75151619 2024-05-31T16:59:04+02:00 `upgrade status`: polish alert insights + - 4b531b2d 2024-05-30T17:10:08+02:00 pkg/cli/expose: override print flags for cmd + - 18405673 2024-05-30T17:10:08+02:00 pkg/cli/create,pkg/cli/expose: use custom scheme + - 109236a1 2024-05-30T17:10:03+02:00 pkg/helpers/scheme: stop loading legacy schemes on global scheme diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 6b48c1b514..d9cb1f994b 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d https://github.com/openshift/ovn-kubernetes image-amd64 d5664bf3414ff6a66e76100a18570ed0297e0f47 https://github.com/openshift/kubernetes image-amd64 4a87b5377b72baed624e7afa315bb8622117ebf9 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac -https://github.com/openshift/oc image-arm64 d5b5b3a62fa4743a9e7a9cd4779b08d7f3e58c31 +https://github.com/openshift/oc image-arm64 0bea0594b2cdb44de33be3a96f8ac2cf68e10ee2 https://github.com/openshift/coredns image-arm64 4a14f3481105adf4b4086ba9727bee3dec0847fd https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 730e049394..71694d806a 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-05-30-165837" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-05-24-193308" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-02-224131"