diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b8bbe3f192..fe2f44e963 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-24-040530 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-26-170529 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index e2dbb498a3..afc11d68d8 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ad607f3a0bef666920dbd807447fd2c4e04e557f120ef030f4f36c83936270be + digest: sha256:954f9112aa037776e9be6badd4cdc79267d550deb834aeb7251a673675fb0732 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:577e8224a9eb340a79595d49c8cec5ab84090ee15e3a2fab29482a68d7f7f4e8 + digest: sha256:935bdd6c0896b12d0685b78a69a862e6ec6b5445d44b78549b4ae6148ff51168 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 5d77a5941f..92897217ba 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-08-24-040530" + "base": "4.17.0-0.nightly-arm64-2024-08-26-170529" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad607f3a0bef666920dbd807447fd2c4e04e557f120ef030f4f36c83936270be", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:577e8224a9eb340a79595d49c8cec5ab84090ee15e3a2fab29482a68d7f7f4e8" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:954f9112aa037776e9be6badd4cdc79267d550deb834aeb7251a673675fb0732", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:935bdd6c0896b12d0685b78a69a862e6ec6b5445d44b78549b4ae6148ff51168" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 1e54cb1f08..df3819394a 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c7d2e52a0c11ecc693af084dc2324da1d21e1ddccce85159f165e49a12d6d52a + digest: sha256:e7d94427c1d4277cc6774054ff760b7079363287552e76acc685ddab6cc47eb9 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d4ad286bf124936100606b56f0285b6b6d6f884ef938098356b4838a216f62bb + digest: sha256:0a3791b90a0a50cd300af80407f6009938f83982d447ac1f652494c25342a4ab - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7e4e56c38b1d7d95829f83d4df3de548711b3114a887bcc5a7dd02c95f44945e + digest: sha256:07f75a7f566e42cebb4cdf6f62e726f0865c289b5d7c0382c86aa404695a920a patches: - patch: |- @@ -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:d4ad286bf124936100606b56f0285b6b6d6f884ef938098356b4838a216f62bb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a3791b90a0a50cd300af80407f6009938f83982d447ac1f652494c25342a4ab - 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:c7d2e52a0c11ecc693af084dc2324da1d21e1ddccce85159f165e49a12d6d52a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7d94427c1d4277cc6774054ff760b7079363287552e76acc685ddab6cc47eb9 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 8f487e30a9..2d1556ae43 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-08-24-040530" + "base": "4.17.0-0.nightly-arm64-2024-08-26-170529" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7d2e52a0c11ecc693af084dc2324da1d21e1ddccce85159f165e49a12d6d52a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4ad286bf124936100606b56f0285b6b6d6f884ef938098356b4838a216f62bb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e4e56c38b1d7d95829f83d4df3de548711b3114a887bcc5a7dd02c95f44945e" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7d94427c1d4277cc6774054ff760b7079363287552e76acc685ddab6cc47eb9", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a3791b90a0a50cd300af80407f6009938f83982d447ac1f652494c25342a4ab", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07f75a7f566e42cebb4cdf6f62e726f0865c289b5d7c0382c86aa404695a920a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 78d3b9638a..f8414edb2b 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,18 +1,18 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-08-24-040530" + "base": "4.17.0-0.nightly-arm64-2024-08-26-170529" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9797e907d772555e402c6588635d9cd46b83bdac88ee8fc4af344e7a30d8d185", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4030a7b9658eb2d1055a1c0ff48891f5793fa5feae34d9273fe07d40401c733c", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0aa623baab94f5d3aa790eaaf111704f77c53a5de4a4f4df7c543b5769f30e33", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e4e56c38b1d7d95829f83d4df3de548711b3114a887bcc5a7dd02c95f44945e", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5e66c5ca9d22904b8f762498896efb342cbacd31bbab6fc1ce0680f01f48bef", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89568bc07b3aea7f89f89f9092c68f2c4a0a359fe00f1d935e1c8e1e3913e286", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0ea49e258f4da9792d1de4acf62b06f40c8d37e71db8046ef5802e87a48d60d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07f75a7f566e42cebb4cdf6f62e726f0865c289b5d7c0382c86aa404695a920a", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef09a67a4ad363473199a373de066bd5c16db948b6b81bb4f960a64c067d1d55", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7612da6be6c2ef6bcc39ddf64ade7662e9e97bca34796caac451c514a6d1367b", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b8b9bab72934390b3483e8fc67d32c7503ae687545103f9a19fa5368698f9ee", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4129e256d00fbb8d0e43c1d33740edad74ebb2585f6ddb3486b2632fbe33d58", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:335bb55fa1cc32b6fded3a5e764db08c4b6178afdef939d4a5e29855642b6dbb", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd4aede6612e241c1a147918987fdea1f707a835d2dbc3404c75cb4311f575a8", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f10247f859adad35abf538523d520d191e95756f806dc21f96f9e5e3265c57f", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddb533203949e1e440aaa9974de5f3dd753863ae1ce56f48378c4b58ef06ca69" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59bfb7d9af6eddd35c1dbca91ded8a1ce7bc8fcfa23507ab0b5780d63e1991dc", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03eb66a3be27c3dcb479a3abaabd25427cd7115f81dfc220346974f6509a980b" } } diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index dc2e3c43de..e7d48760b0 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -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:7612da6be6c2ef6bcc39ddf64ade7662e9e97bca34796caac451c514a6d1367b" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:335bb55fa1cc32b6fded3a5e764db08c4b6178afdef939d4a5e29855642b6dbb" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3d8966e8eb..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +0,0 @@ -- oc image-arm64 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf to 30c77fb30bef0cf2c4b7ab37862ae060f6faf47d - - 95e0aa72 2024-08-20T13:28:44+00:00 Adding examples for add-cluster-role-to-* and remove-cluster-role-from-* so they show in the CLI docs - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 9058c6672b..8c42747c3c 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-08-19-165854" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-24-040530" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-08-19-165854" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-26-170529"