diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 5a84d7bc6b..a882797bf0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-11-031617 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-11-232600 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 2d53ba0bf6..b4892bdeca 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/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:a339483761ed2aa820d4181a0395ca3edef83e631cdd4433c8e7ccf1a39c1b8c + digest: sha256:b4da049ffe041e5144dd90000de502380e88e8ca5f00bfdd72ec7fc61db5c000 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:87a3fc20e2672e68587e04209a0a5f17e798f424ba756cdf84fd7449b531760d + digest: sha256:963caa8d07c3e52f066537bbcc223a23acc6944bd9e2957aa9df4208f2640b02 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 569b3e026b..8e10c628df 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-11-031617" + "base": "4.22.0-0.nightly-arm64-2026-05-11-232600" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a339483761ed2aa820d4181a0395ca3edef83e631cdd4433c8e7ccf1a39c1b8c", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a3fc20e2672e68587e04209a0a5f17e798f424ba756cdf84fd7449b531760d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4da049ffe041e5144dd90000de502380e88e8ca5f00bfdd72ec7fc61db5c000", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:963caa8d07c3e52f066537bbcc223a23acc6944bd9e2957aa9df4208f2640b02" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 81279019f6..a1bb7af3f1 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:b300f79d3b5391e155c45586f7273061fe72c63cd684b14fc2f45e13af8eb391 + digest: sha256:9f411caf14336833b42801cfc6ecc928145fbb83ad76128e81650422ebadffe3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:dfc17d862ab5364327bdea9edd36205e10864617f4a10846660f170bfad65953 + digest: sha256:53b74374ff9485659a4f2d4d9c94e196c2fd37e996ae0045fb8e78c7ac66ada8 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bad63efb7c149b090e9ce499e037e2720bfea98da65a021ee903f5d8d2107b8d + digest: sha256:09cb00fe57782a26eb24200e33e48fc8f73ca7ff0bfe3d357162d7237b1584f7 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:dfc17d862ab5364327bdea9edd36205e10864617f4a10846660f170bfad65953 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53b74374ff9485659a4f2d4d9c94e196c2fd37e996ae0045fb8e78c7ac66ada8 - 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:b300f79d3b5391e155c45586f7273061fe72c63cd684b14fc2f45e13af8eb391 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f411caf14336833b42801cfc6ecc928145fbb83ad76128e81650422ebadffe3 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 b35dd4aae6..5cdb590d98 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.22.0-0.nightly-arm64-2026-05-11-031617" + "base": "4.22.0-0.nightly-arm64-2026-05-11-232600" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b300f79d3b5391e155c45586f7273061fe72c63cd684b14fc2f45e13af8eb391", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dfc17d862ab5364327bdea9edd36205e10864617f4a10846660f170bfad65953", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bad63efb7c149b090e9ce499e037e2720bfea98da65a021ee903f5d8d2107b8d" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f411caf14336833b42801cfc6ecc928145fbb83ad76128e81650422ebadffe3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53b74374ff9485659a4f2d4d9c94e196c2fd37e996ae0045fb8e78c7ac66ada8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09cb00fe57782a26eb24200e33e48fc8f73ca7ff0bfe3d357162d7237b1584f7" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 4e231f5943..d008eb0c77 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-11-031617" + "base": "4.22.0-0.nightly-arm64-2026-05-11-232600" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:283dabdca83c3bd1143b81351b2531399e985e929255cfbe2c071f46ef69e75b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a04599a629047e5207302d1abc3cd34e0d53a7317eb2975afc6b47f0d37aa22", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d95f2a39f9b0a3c93ae81e3b1598fbc1daec60934121d705a74d439663dc1fca", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bad63efb7c149b090e9ce499e037e2720bfea98da65a021ee903f5d8d2107b8d", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fba8b924f84e0a95572434784acd1a9e93963fdbc5a66b84df52162b4431c23", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddd8fc893c116c07bd691b60e6640966fde4fc2ac731e7f26337f2e2d5c97048", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7847b2c52a18ca9a52e95aebbf518795db0793e2365f9eb9a3868d266b6e49a8", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4613d379e23347c434c99887f7d42ff360ff4c65e1db0b23a7c95fce2fd80500", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9066c2ef343be39b5f248017e845ae0de7e003a5dd211738b23b2fcb5c306845", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c57eb9822e8280db4f7257cea7587145b6bc6214ed3eb93355f31c7ca6d3594", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09cb00fe57782a26eb24200e33e48fc8f73ca7ff0bfe3d357162d7237b1584f7", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb09b2e8da2eb2ba852811439039f7e89ad80436712565d764e13ca0f0a8bf33", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9a202053ae0a20169769910a2a1159819e03b92535bb569162161e20393267b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9a3e1bd6d9e3ecb7647d9d6662f6e35cb02095746fdefe6b81c3f965c6362e1", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9a9ad26a571bf48412b71ea60ddbffbe5d27a9a1e44180348cdc1afe132a0f4" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7b6bc4a2a2374dfff00d122e595df16583bb9f3214379f6077520da411010d6" } } diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index efe8e80eec..69fc8c5247 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # 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:ddd8fc893c116c07bd691b60e6640966fde4fc2ac731e7f26337f2e2d5c97048" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9a202053ae0a20169769910a2a1159819e03b92535bb569162161e20393267b" 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 606eba559c..e69de29bb2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,28 +0,0 @@ -- cluster-ingress-operator embedded-component 6cf59c532a28e46ced7e18c5aa4b04283fea8f61 to 52c2b0465ecf1dcdcd57c010b9b15ac28f62a2ba - - 80cc5ec 2026-05-05T22:34:34Z Allow host network connections to the ingress canary - - b1ed6a6 2026-05-05T14:28:30Z waitForDeploymentEnvVar: Remove client parameter - - ceee137 2026-05-05T14:28:30Z TestUnsupportedConfigOverride: Ignore featuregate - - a19ef82 2026-05-05T14:28:30Z Add waitForDeploymentFunc test helper func - - 2f68c38 2026-05-05T14:28:30Z waitForDeploymentEnvVar: Fix godoc - -- kubernetes embedded-component da4553e9f23c91c792094a1ddbba933784becce4 to 80f28ac33ac111532fb8ba59b2e569085ee871b0 - - d9dec3899 2026-04-28T17:11:27Z UPSTREAM: 138244: devicemanager: constrain topology hints to device NUMA nodes - -- machine-config-operator embedded-component 487334b7ed9bdd7c55e9eeb3a90027e5e1f927a2 to b7a8bf128b2775ea19c8191efa774f0660b2be70 - - 5a2dee70 2026-05-06T19:33:08Z daemon: skip bootupd when shim is safe - - 87366809 2026-05-05T13:38:58Z crio: enable default_runtime metric - - 185c923e 2026-05-05T13:38:58Z prom rules: add alert for nodes using runc - - 948f3c83 2026-05-04T08:05:21Z OCPBUGS-84406: Fix CVE-2026-34986 - -- operator-framework-olm embedded-component e627823c743797da91b4ae8a318d2420a511b752 to de6260e53055e10e216ec668d692a35554ab0585 - - f6cf1456 2026-05-06T10:40:17-04:00 Update github.com/go-jose/go-jose/v4 to v4.1.4 - -- service-ca-operator embedded-component 7b3033bba87d7b40684b66f8f44a3525433d1ac7 to 9fff46a576033685f66fbb1121eb0a2f134a29be - - a3e8484 2026-05-04T14:13:16Z test: network policy tests - -- kubernetes image-amd64 da4553e9f23c91c792094a1ddbba933784becce4 to 80f28ac33ac111532fb8ba59b2e569085ee871b0 - - d9dec3899 2026-04-28T17:11:27Z UPSTREAM: 138244: devicemanager: constrain topology hints to device NUMA nodes - -- service-ca-operator image-amd64 7b3033bba87d7b40684b66f8f44a3525433d1ac7 to 9fff46a576033685f66fbb1121eb0a2f134a29be - - a3e8484 2026-05-04T14:13:16Z test: network policy tests - diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 32a5e231e1..61ab858eeb 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.22.0-0.nightly-2026-05-10-025105" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-11-031617" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-10-025105" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-11-232600"