diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 7b7db68e30..bee078cf53 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2025-09-16-163803 +OCP_VERSION := 4.21.0-0.nightly-arm64-2025-09-20-145748 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index cf320c38b1..e9d9ab5c56 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2025-09-18-193221 +OCP_VERSION := 4.21.0-0.nightly-2025-09-19-012417 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 621f0325ef..51699efafc 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:ddbc09b143ab4922596a838082ba86b64f9f3d799db6f333de417c4a78802e2d + digest: sha256:2cd4dc33075a0ce98d1e81f8fe2b27c6f1da48e9d5d39ac7b019229db90d61f3 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0a4e638174de0237bf2360fb467d035a2f02c48a8a27fd6053e3c98944d712d6 + digest: sha256:ff955c494b21172f285200eed204e692b8cc4bbe86068a3b3acbfeea5611dcb3 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 627006e14f..4c72260ee2 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-09-16-163803" + "base": "4.21.0-0.nightly-arm64-2025-09-20-145748" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbc09b143ab4922596a838082ba86b64f9f3d799db6f333de417c4a78802e2d", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a4e638174de0237bf2360fb467d035a2f02c48a8a27fd6053e3c98944d712d6" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cd4dc33075a0ce98d1e81f8fe2b27c6f1da48e9d5d39ac7b019229db90d61f3", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff955c494b21172f285200eed204e692b8cc4bbe86068a3b3acbfeea5611dcb3" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 3e2c9cd260..868bcf7be6 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-09-18-193221" + "base": "4.21.0-0.nightly-2025-09-19-012417" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0719a66144b744eff9a1f8f5f7ccc029d190f4652ccbceed0fa12dd2b8a526d0", diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml index 2c9225e609..eb6cbf37aa 100644 --- a/assets/optional/kube-proxy/kustomization.aarch64.yaml +++ b/assets/optional/kube-proxy/kustomization.aarch64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4247e573b4d95b9c3f47a64bb8865e142920670f96efcad8b8d483e24022f588 + digest: sha256:fd3f282e344a62e8e50c656c8eeffd94ad1994d6ee6d1b499ef573b3a1105d68 diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index 7d3fcb1096..90b85df988 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-09-16-163803" + "base": "4.21.0-0.nightly-arm64-2025-09-20-145748" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4247e573b4d95b9c3f47a64bb8865e142920670f96efcad8b8d483e24022f588" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd3f282e344a62e8e50c656c8eeffd94ad1994d6ee6d1b499ef573b3a1105d68" } } diff --git a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json index fb020aee1f..b2f08c61b9 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-09-18-193221" + "base": "4.21.0-0.nightly-2025-09-19-012417" }, "images": { "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:579115709c542137cab2ea08c59f4ab053a720a4baf1c5c44d1b0f531c43de63" diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 655f5d6101..3c83002928 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:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b + digest: sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4 + digest: sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7 + digest: sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b 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:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1 - 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:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc 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 6b5568bad5..e73b519420 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.21.0-0.nightly-arm64-2025-09-16-163803" + "base": "4.21.0-0.nightly-arm64-2025-09-20-145748" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 679c1e98ec..d973350ce9 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-09-18-193221" + "base": "4.21.0-0.nightly-2025-09-19-012417" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d609fb68b5621bcd1fb216a1f10a326d22acee9f451de7b4c41ceb390987e77", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 6433f1bccb..191bbd7fe5 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-09-16-163803" + "base": "4.21.0-0.nightly-arm64-2025-09-20-145748" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f786b139e772e08de35e6ad45bcf956fcfc78c5d76c4217a55e4ae64ee7a3c24", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a9c72411c4eacabd7f45570bbf0467ee5a53d021562edf080385e8764a726cb", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2b91a1fbe4bd66e24099e0e77f08ad8814961c73a3be33d80cde13fd6cb197e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf5bf3ca0d85086b41daaa5d53eadc3c0038ab935873c926c1a109906b7d118f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9dba3e46b2e0d04b7f0bb2e7da314a429d76f28573015f26f85c7baf6037998", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:704fb9154fa0dfb8a4dc55474d7d24b8ab6185ea6e1bb1d79cadd38122669b65", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce0d25472b0f774efa0338b48cb9f595f5c6cc77a3af38c2f927483c03160819", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f049f67d64869428ffe8b3b63c2a9a423fc016f5950772d5aab6edfc299d237e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0c8624075be315462b24c7d26f0e4ed2a646f5391324284a8f13a9ed8eaaed", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3b9f80e229b80a8f0c30442c7b63db7342ee9b6d9fb0e1571c216045b418d29", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3f6b8d5389921b48df4b81afe2f69703c457207e380143e8a8929987c620f40", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83f01ddcb6769ca390d2d9b37bebd09866b8ba3583f5d7685e0e8bf23d9749c1", "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:013450806f68220b5cdd74690a1f8fa992feda9f28fd76478e22b4e5cc73a0d4" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf4fa06135074add7898adb42a280c7324937cb8bddc22f2e14bfd5d86226e29" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f0207c2133..f18ad45244 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2025-09-18-193221" + "base": "4.21.0-0.nightly-2025-09-19-012417" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71d4467239a45093b768070b6bf4459fd3f6b76c39ac060c693f90ee0b49a17a", diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index f5c1bb444a..8a4ffd2c20 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:c9dba3e46b2e0d04b7f0bb2e7da314a429d76f28573015f26f85c7baf6037998" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3f6b8d5389921b48df4b81afe2f69703c457207e380143e8a8929987c620f40" 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 1c38fe59f8..2fac3db2b1 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,131 +1,37 @@ -- api embedded-component 61248d910ff74aef020492922d14e6dadaba598b to 83b017b06367bf8564bf94f5c6c1ad8aed5d3ab9 - - b6f0e27a 2025-09-16T10:45:31+01:00 Update controller-tools - - 881674e4 2025-09-01T15:03:56+02:00 Add metric server API +- openshift-controller-manager embedded-component b297407761ee836f0a43a42ba0486bc97b54f888 to 15fc552a73e47ae715f0cf59e3f535e26b43477a + - ce067c2 2025-09-18T14:00:16+05:30 Fix Dockerfile.rhel: Add OTE binary build and packaging -- cluster-dns-operator embedded-component 63a93b05b131a3f7ee8b482a5cb4f0c1eac8660e to 1272aef21dd5dcdbefbf4888c7b0a4a427683fd7 - - 6f21905 2025-09-15T15:07:12-04:00 Add bentito (btofel@redhat.com) to OWNERS - -- cluster-ingress-operator embedded-component 60b4279f91f6fbc135d8f15bda96a5ae664e252a to c968596268df58ed8747a8f88ebb8c501824bbb2 - - c5c5c85 2025-09-15T14:55:09-04:00 Add bentito (btofel@redhat.com) to OWNERS - - cc00436 2025-08-20T17:16:07+01:00 OCPBUGS-55673: Remove IngressControllerLBSubnetsAWS featuregate - -- cluster-kube-apiserver-operator embedded-component 0bec046c8c10682390e2a20ae4f416a2d8589f40 to 25092d8447b0186402dcf2a6564f6ac2ebf55c9b - - f127598 2025-09-15T09:51:28-07:00 bump(k8s): promote MutatingAdmissionPolicy to v1beta1 for > 1.34.0 - -- cluster-kube-controller-manager-operator embedded-component 3b20c534b1b92d46055147c4f82f69b2ad3044c9 to a92da07ac1f335c148411c838dd2982c9ca90988 - - 1e279cb 2025-08-20T17:37:46+02:00 Remove --cloud-provider=external from KCM - -- cluster-kube-scheduler-operator embedded-component f9b5b31943f2be768af6373def4c8946a30d0ed6 to 2345371abed5896006ac4a60c7d555fc25502c0a - - 4339305 2025-09-05T13:59:33+02:00 adding ROFS - - 9d6fe98 2025-09-05T10:17:36+02:00 adding ROFS - -- cluster-network-operator embedded-component 09a4accb5ee420155d19fbf78c6be058be50ee0e to c069f36d58d9d8ad4a9cd23a410fb263a5e689ed - - 7e8f8cc 2025-09-11T15:41:54-04:00 Add validation check for labels and test - - 97b68b8 2025-09-11T15:40:31-04:00 Add documentation surrounding the Smart-NIC/DPU Host/DPU mode labels - - 842c48c 2025-09-11T15:39:37-04:00 Relax label req. of DPU/DPU Host/Smart NIC - -- cluster-policy-controller embedded-component 3e7538547c8f209c72083097a4ebaada6e9c46c5 to 0e2948510331ff9351c5eb6d7f2f440afc7aa17a - - f281462 2025-08-19T14:18:12+02:00 scc allocation controller: Use server-side apply - -- kubernetes embedded-component 679fad59c6fcb6cd86bccb25ac702ec10d5ea15b to 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e - - bd238e196 2025-09-17T10:47:16-04:00 UPSTREAM: : Add retries for GetCurrentResourceVersion. - - 87b26c865 2025-09-09T13:36:27+02:00 UPSTREAM: 133959: Do not remove PVC ClaimRef to fix flaky VAC test - -- machine-config-operator embedded-component cd9b709c16ad9d8b32701d13af2d068eb4ca9c49 to 223bed017865d085a6fda3a41050627be96ed340 - - 139dd0c2 2025-09-15T16:27:15-05:00 OCPBUGS-61695: Override NMState service definition - - fd87e53a 2025-09-15T15:52:14-04:00 units: add delays to TestOSBuildController - - c6f988c0 2025-09-15T10:48:16-05:00 add new recording rule for unsuported packages - - 1889a793 2025-08-27T10:00:56-04:00 msbic: add unit tests - - 55a0cc80 2025-08-27T10:00:56-04:00 msbic: add azure platform support - - 0c077d64 2025-08-25T11:59:59-04:00 operator: add azure boot image update gates - - ae39bd1b 2025-08-25T11:59:59-04:00 vendor bump for Azure stream updates - - 3f274443 2025-08-19T09:13:17-04:00 Add nil/null checks to image registry secret decode - - 715f38dd 2025-08-12T09:02:58-04:00 install: remove mcn crd cleanup cronjob - -- openshift-controller-manager embedded-component 49aaf599fb9024f36359f55bac6b3bb1482e24b8 to b297407761ee836f0a43a42ba0486bc97b54f888 - - 6c2059d 2025-09-15T14:20:48+05:30 set up openshift-tests-extension for cluster-openshift-controller-manager-operator and add a sanity test - -- operator-framework-olm embedded-component 52b69a5bc151303c21268007009c0300f3170bc2 to 44c993131781ff5bfb8665b0e6cc1d2a3bf23839 - - fd5119fc 2025-09-18T14:07:22+08:00 move golangci-lint and go-bindata to new location to fix sync - - 62ce21ab 2025-09-17T14:07:14+08:00 add OTE into olmv0 with new location - - 57aa443f 2025-09-16T18:32:25Z migrate containers libs to new mono-repo (#1799) - - cdba3e50 2025-09-16T18:31:45Z set an exception for migrate file permissions (#1798) - - 8bc227c4 2025-09-16T18:31:21Z Bump the golang-x-deps group across 1 directory with 2 updates (#1797) - - f1e8858f 2025-09-16T18:30:35Z Bump google.golang.org/grpc from 1.75.0 to 1.75.1 (#1796) - - 9e6853ab 2025-09-16T18:30:21Z Bump github.com/maxbrunsfeld/counterfeiter/v6 from 6.11.3 to 6.12.0 (#1791) - - f1d6e13b 2025-09-16T18:30:07Z Bump google.golang.org/protobuf from 1.36.8 to 1.36.9 (#1793) - - abfd941b 2025-09-16T18:29:53Z switch tactics (#1750) - - eba479a4 2025-09-16T18:29:39Z Bump the golang-x-deps group with 2 updates (#1789) - - 872ca763 2025-09-16T18:29:25Z Bump actions/setup-go from 5 to 6 (#1788) - - 7de9f98d 2025-09-16T18:29:11Z Bump actions/stale from 9 to 10 (#1787) - - 269b972a 2025-09-16T18:28:57Z Bump github.com/onsi/ginkgo/v2 from 2.25.2 to 2.25.3 (#1786) - - d6aa1ba3 2025-09-16T18:28:43Z Bump github.com/containers/common from 0.64.1 to 0.64.2 (#1785) - - 57264134 2025-09-16T18:28:27Z Bump github.com/docker/cli (#1784) - - af9d1f73 2025-09-16T18:28:13Z Bump github.com/containers/image/v5 from 5.36.1 to 5.36.2 (#1783) - - 8633b4bc 2025-09-16T18:27:59Z Bump github.com/spf13/pflag from 1.0.9 to 1.0.10 (#1782) - - 0ff2fb3d 2025-09-16T18:27:45Z Bump github.com/ulikunitz/xz from 0.5.12 to 0.5.14 (#1781) - - eb1a07e9 2025-09-16T18:27:31Z Bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (#1779) - - 301f97f5 2025-09-16T18:27:16Z Bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (#1776) - - b5926636 2025-09-16T18:27:01Z Add key ordering for mermaid graph output (#1778) - - e3b314e5 2025-09-16T18:26:47Z Bump github.com/spf13/pflag from 1.0.7 to 1.0.8 (#1775) - - 93fa5af0 2025-09-16T18:26:32Z Bump github.com/golang-migrate/migrate/v4 from 4.18.3 to 4.19.0 (#1774) - - 74e7824b 2025-09-16T18:26:10Z OPRUN-4119: migrate containers libs to new mono repo (#3657) - - 15c068ae 2025-09-16T18:25:53Z :seedling: Bump github.com/containers/image/v5 from 5.36.1 to 5.36.2 (#3655) - - b3909aea 2025-09-16T18:25:36Z :seedling: Bump golang.org/x/time from 0.12.0 to 0.13.0 (#3654) - - 0dd890f4 2025-09-16T18:25:19Z :seedling: Bump github.com/operator-framework/operator-registry (#3656) - - 6b718ac6 2025-09-16T18:24:57Z :seedling: Bump golang.org/x/net from 0.43.0 to 0.44.0 (#3653) - - 57b4385b 2025-09-16T18:24:37Z :seedling: Bump github.com/prometheus/client_golang from 1.23.0 to 1.23.2 (#3649) - - 9f255f70 2025-09-16T18:24:17Z Bump actions/stale from 9 to 10 (#3651) - - 28fa15aa 2025-09-16T18:23:58Z Bump actions/setup-go from 5 to 6 (#3650) - - c240bda3 2025-09-16T18:23:28Z :seedling: Bump github.com/prometheus/common from 0.65.0 to 0.66.1 (#3648) - - b65ec3fb 2025-09-16T14:05:25+08:00 UPSTREAM: : add jiazha to approvers - - 22a2cb72 2025-09-16T10:41:32+08:00 Revert "OCPQE-29415: UPSTREAM: : add OTE into olmv0" - - ec6e19a6 2025-09-12T20:31:11Z Updating operator-registry-container image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/1097a63a576d216981abbff7a60c4c5da67d1644/images/operator-registry.yml - - a3ba3ae2 2025-09-12T13:42:21+08:00 UPSTREAM: : add OTE into olmv0 - - 825dc7b2 2025-09-12T09:30:09+08:00 set package-server-manager as default container - -- service-ca-operator embedded-component b0fe556a981964728306f803864af9d2881db967 to a40d9a8ec60e0c6c1578300c372b6104130f2ecc - - dc11bc4 2025-09-15T11:18:02+02:00 secret_creating_controller: improve hotloop tests - - ae08731 2025-09-12T14:56:47+02:00 secret_creating_controller: fix hotloop on create secret error - - 9052e26 2025-09-12T14:41:46+02:00 secret_creating_controller_test: cover failure with invalid name - - 8a83a3f 2025-09-11T17:24:11+02:00 secret_creating_controller_test: add secretName to test struct - - 9e0422c 2025-09-11T17:22:42+02:00 secret_creating_controller_test: fix typo in test struct field name - -- oc image-amd64 f7c9fc36fbaa85b3cbf0c2e85dd4a42e20f6952d to 0e4fabc98dc46c9fca79544297783053a49370ce +- oc image-arm64 fa1bc38754e9b24d392d7845a290cf996d8da146 to 0e4fabc98dc46c9fca79544297783053a49370ce - 4e6421d1 2025-09-17T14:26:04+02:00 pkg/.../inspect: Add support for context - 08ec7194 2025-09-17T13:08:45+02:00 must-gather: Align cleanup order - 19c0d4b7 2025-09-17T12:59:07+03:00 Add tchap as reviewer in oc - - 582a8bdc 2025-09-11T14:31:15+02:00 vendor: Update library-go and go-ldap - - 21b0e7cb 2025-09-11T14:31:15+02:00 oc adm groups sync: Use client.Unbind -- coredns image-amd64 6f39336e6da9dc77b2db140a96773c413d50a665 to 42e2cf1e46dfd9dd11669b06fb1d619cd9335e17 +- coredns image-arm64 6f39336e6da9dc77b2db140a96773c413d50a665 to 42e2cf1e46dfd9dd11669b06fb1d619cd9335e17 - 6e38175 2025-09-15T16:48:48-04:00 Add bentito (btofel@redhat.com) to OWNERS -- router image-amd64 2bc8169c87ccd69cceeeab7552bedb6f16a34c84 to 2c1a6790a4208cea7b8809ebdba3d2a8223827a8 +- router image-arm64 2bc8169c87ccd69cceeeab7552bedb6f16a34c84 to 846c6ca6d4222fd0fcd7891edb66dcf226f61c45 - c153dfe 2025-09-15T16:49:10-04:00 Add bentito (btofel@redhat.com) to OWNERS - - 2add7ea 2025-06-20T06:39:20Z Updating ose-haproxy-router-base-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-haproxy-router-base.yml + - 088afb0 2025-06-20T13:08:14+00:00 Updating openshift-enterprise-haproxy-router-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/openshift-enterprise-haproxy-router.yml + - 2add7ea 2025-06-20T06:39:20+00:00 Updating ose-haproxy-router-base-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-haproxy-router-base.yml -- ovn-kubernetes image-amd64 8567f11fa93e164b6eb424ce2f831c608e1094f4 to 5ad762f86466c2e11b94da2cee211cec97e16a3a - - b36bb31d 2025-08-29T13:27:35-04:00 OCPBUGS-61065: As part of DPF installation we are required to use OCP downstream image for dpu service. Dpu service uses upstream ovnkube.sh script that requires ovndb-raft-functions.sh as a dependency. This change copies it into the image as part of Dockerfile.base - -- kubernetes image-amd64 679fad59c6fcb6cd86bccb25ac702ec10d5ea15b to 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e +- kubernetes image-arm64 b59afbdc1eb4ecb7c8b19b8cc95c4657df6caf6d to 5c9df339496a7595967e06682ece7d0b2145411c - bd238e196 2025-09-17T10:47:16-04:00 UPSTREAM: : Add retries for GetCurrentResourceVersion. - - 87b26c865 2025-09-09T13:36:27+02:00 UPSTREAM: 133959: Do not remove PVC ClaimRef to fix flaky VAC test - -- service-ca-operator image-amd64 b0fe556a981964728306f803864af9d2881db967 to a40d9a8ec60e0c6c1578300c372b6104130f2ecc + - 61a5f42bd 2025-09-11T17:26:59-04:00 UPSTREAM: : hack/update-vendor.sh, make update and update image + - 03e764d03 2025-09-09T19:43:57+00:00 Release commit for Kubernetes v1.33.5 + - b246955af 2025-08-28T22:57:01+08:00 Fix missing control plane health check timeout + - c1a0f959a 2025-08-28T10:31:15+02:00 Add a note about Conflicts return value + - 2d6c21edd 2025-08-28T10:31:15+02:00 Fix SELinux label comparison + - fe2d1b268 2025-08-28T10:31:15+02:00 Add missing cases to SELinuxMount tests + - 9d0999731 2025-08-21T09:09:11-04:00 Remove patch/update from ServiceCIDR API conformance test + - 98b3daba8 2025-08-14T13:31:05+02:00 Bump dependencies, images and versions used to Go 1.24.6 and distroless iptables + - 0ae9d1d16 2025-08-13T14:40:41+00:00 Update CHANGELOG/CHANGELOG-1.33.md for v1.33.4 + - d8676a24c 2025-07-22T08:21:08-04:00 Added NodeSelectors field to DriverDefinition + - b5fa540b2 2025-07-16T11:07:06+02:00 Mask Linux thermal interrupt info in /proc and /sys. + +- service-ca-operator image-arm64 b0fe556a981964728306f803864af9d2881db967 to a40d9a8ec60e0c6c1578300c372b6104130f2ecc - dc11bc4 2025-09-15T11:18:02+02:00 secret_creating_controller: improve hotloop tests - ae08731 2025-09-12T14:56:47+02:00 secret_creating_controller: fix hotloop on create secret error - 9052e26 2025-09-12T14:41:46+02:00 secret_creating_controller_test: cover failure with invalid name - 8a83a3f 2025-09-11T17:24:11+02:00 secret_creating_controller_test: add secretName to test struct - 9e0422c 2025-09-11T17:22:42+02:00 secret_creating_controller_test: fix typo in test struct field name -- oc image-arm64 f7c9fc36fbaa85b3cbf0c2e85dd4a42e20f6952d to fa1bc38754e9b24d392d7845a290cf996d8da146 - - 582a8bdc 2025-09-11T14:31:15+02:00 vendor: Update library-go and go-ldap - - 21b0e7cb 2025-09-11T14:31:15+02:00 oc adm groups sync: Use client.Unbind - -- ovn-kubernetes image-arm64 8567f11fa93e164b6eb424ce2f831c608e1094f4 to 5ad762f86466c2e11b94da2cee211cec97e16a3a - - b36bb31d 2025-08-29T13:27:35-04:00 OCPBUGS-61065: As part of DPF installation we are required to use OCP downstream image for dpu service. Dpu service uses upstream ovnkube.sh script that requires ovndb-raft-functions.sh as a dependency. This change copies it into the image as part of Dockerfile.base - -- kubernetes image-arm64 679fad59c6fcb6cd86bccb25ac702ec10d5ea15b to b59afbdc1eb4ecb7c8b19b8cc95c4657df6caf6d - - 87b26c865 2025-09-09T13:36:27+02:00 UPSTREAM: 133959: Do not remove PVC ClaimRef to fix flaky VAC test - diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 966c8b52ff..9506739ba6 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -13,7 +13,7 @@ https://github.com/openshift/etcd embedded-component 9c065d4d842c8de57806426c132 https://github.com/openshift/kubernetes embedded-component 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953 https://github.com/openshift/machine-config-operator embedded-component 223bed017865d085a6fda3a41050627be96ed340 -https://github.com/openshift/openshift-controller-manager embedded-component b297407761ee836f0a43a42ba0486bc97b54f888 +https://github.com/openshift/openshift-controller-manager embedded-component 15fc552a73e47ae715f0cf59e3f535e26b43477a https://github.com/openshift/operator-framework-olm embedded-component 44c993131781ff5bfb8665b0e6cc1d2a3bf23839 https://github.com/openshift/route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20 https://github.com/openshift/service-ca-operator embedded-component a40d9a8ec60e0c6c1578300c372b6104130f2ecc @@ -25,11 +25,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 b9134351be37c4340833404 https://github.com/openshift/ovn-kubernetes image-amd64 5ad762f86466c2e11b94da2cee211cec97e16a3a https://github.com/openshift/kubernetes image-amd64 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e https://github.com/openshift/service-ca-operator image-amd64 a40d9a8ec60e0c6c1578300c372b6104130f2ecc -https://github.com/openshift/oc image-arm64 fa1bc38754e9b24d392d7845a290cf996d8da146 -https://github.com/openshift/coredns image-arm64 6f39336e6da9dc77b2db140a96773c413d50a665 +https://github.com/openshift/oc image-arm64 0e4fabc98dc46c9fca79544297783053a49370ce +https://github.com/openshift/coredns image-arm64 42e2cf1e46dfd9dd11669b06fb1d619cd9335e17 https://github.com/openshift/csi-external-snapshotter image-arm64 ba8194d5920973069bc56a8bf5844afeedc66bbd -https://github.com/openshift/router image-arm64 2bc8169c87ccd69cceeeab7552bedb6f16a34c84 +https://github.com/openshift/router image-arm64 846c6ca6d4222fd0fcd7891edb66dcf226f61c45 https://github.com/openshift/kube-rbac-proxy image-arm64 b9134351be37c43408334047d8eb85d0ac01fe4e https://github.com/openshift/ovn-kubernetes image-arm64 5ad762f86466c2e11b94da2cee211cec97e16a3a -https://github.com/openshift/kubernetes image-arm64 b59afbdc1eb4ecb7c8b19b8cc95c4657df6caf6d -https://github.com/openshift/service-ca-operator image-arm64 b0fe556a981964728306f803864af9d2881db967 +https://github.com/openshift/kubernetes image-arm64 5c9df339496a7595967e06682ece7d0b2145411c +https://github.com/openshift/service-ca-operator image-arm64 a40d9a8ec60e0c6c1578300c372b6104130f2ecc diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e07a6f373d..0513a925f3 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.21.0-0.nightly-2025-09-18-193221" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-09-16-163803" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-09-19-012417" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-09-20-145748"