diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index a477f9af29..e56cf12f5c 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-16-010853 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-20-030621 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 18356f6606..472d9cebb8 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-04-15-070853 +OCP_VERSION := 4.21.0-0.nightly-2026-04-19-143007 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 0f1f75c134..e87fd1cbda 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:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783 + digest: sha256:c4d0f2f56703ed1a6022869a69150da88c954542447cf0e7d5aa770f1356f1c5 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf + digest: sha256:234054021735699441654e7f8c5a93ef23ac840bd8306d67184cc62f0f2dc8f3 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 6fabc1f8b4..f659f162c5 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647 + digest: sha256:00b7b7eb6c24f7ebcb48bbc780eb25c36c844667889bbe79a1f5bc482b281f62 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063 + digest: sha256:0b14d9446043cdf46a83bc5ea64b85bfc9ffb3e165318b3e59907c6a8cef6deb diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 8fdda69479..d3f802433e 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-2026-04-16-010853" + "base": "4.21.0-0.nightly-arm64-2026-04-20-030621" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4d0f2f56703ed1a6022869a69150da88c954542447cf0e7d5aa770f1356f1c5", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:234054021735699441654e7f8c5a93ef23ac840bd8306d67184cc62f0f2dc8f3" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 7ab0ae1b28..46b470e0da 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-2026-04-15-070853" + "base": "4.21.0-0.nightly-2026-04-19-143007" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00b7b7eb6c24f7ebcb48bbc780eb25c36c844667889bbe79a1f5bc482b281f62", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b14d9446043cdf46a83bc5ea64b85bfc9ffb3e165318b3e59907c6a8cef6deb" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 83278569ab..9c0d5d9d20 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:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a + digest: sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa + digest: sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff + digest: sha256:63ea03cf7443a50341c381b462c35a998948bb37d72e5cd8a5f49217de16fbd3 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:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c - 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:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 97fe2f1f6e..94572d591f 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb + digest: sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9 + digest: sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0 + digest: sha256:33a082238bf2c33d51fdd84cd48865183e35f4c748d6ed63f3f26888084c4c9a 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:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014 - 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:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93 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 1dd11aca6d..8ea2e8a7bc 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-2026-04-16-010853" + "base": "4.21.0-0.nightly-arm64-2026-04-20-030621" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63ea03cf7443a50341c381b462c35a998948bb37d72e5cd8a5f49217de16fbd3" } } 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 2ce91df790..d47372ef12 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.21.0-0.nightly-2026-04-15-070853" + "base": "4.21.0-0.nightly-2026-04-19-143007" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33a082238bf2c33d51fdd84cd48865183e35f4c748d6ed63f3f26888084c4c9a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 0d4ba7b96f..390a6e980a 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-2026-04-16-010853" + "base": "4.21.0-0.nightly-arm64-2026-04-20-030621" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13ca84793073f8fb4daa03fe1f1939b81e1ec8e19d014febc699f5d09c6e3c3b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8172f2b5106c5de4086300554123d7a391ceedfd941e499d4a52346094965ce1", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:858fcdb7d47b5055418fdf4df2be8ed2a28ba21033655b11d0ef566fdb519bc1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f49783c19df6f1d50e606dfc93712ba7650548a96a2b49a3218dd0956950a045", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51b2af82566153af1398888523cc726015af6c712f66bc65f8d9368fd37b7a39", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58988e21d13fa997f8d6cd8d8d0a44deb287b29ae0d21540c584ccc11199d147", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:674dbfe87972674cda0e631a8d06478cd76c12bcbc2f0846147cf917031c18ee", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df368b4cd0dccde9acc65b315112847b58ed94fb7c0e6201bb73a3d04d526216", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25533b19a3647646cbe58c7c6074b8f4cb0b5dfa81146f84c2696a8bf76e0aa4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63ea03cf7443a50341c381b462c35a998948bb37d72e5cd8a5f49217de16fbd3", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3500d400b513d8a0af4169d52f6252ab306cc7d7040b5e12b6419493f212fdbb", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f09c7c987f0efa348a6079cc780e718e9a6bc61c7beefd528e69f1db0f89000", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70ed6c3781d1dc3011f66aee8feb72ff7b49e0c860904e23cd1abfaa0cdbc5d1", "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:af23e48cbed6b6bae6e0d98c1094202a8815b9b2be533a6b5fa89b2908d7496a" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ba903c8aba71f53591c000b6e25afb5cdb5ed0c877fe51695f48934752f2f21" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8627b72ab8..9ae0ade184 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-2026-04-15-070853" + "base": "4.21.0-0.nightly-2026-04-19-143007" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e343d823d1bae702f0e7156e75a0fdcd551da2752731df144fec7b606543e1e", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0380726046c5c0aa952e870fddd0b10606027ef938f58677d07d5bdaf5a25b45", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c48a20fa7b03553b53b9f3f109b7818cfbcfd1d8d459f8989f64c2e5f7403bc2", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bec8399ce9758df1f6dea4174da47cb7a2b5f800f5987a9d516832c6b32a2aa", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f54cb834e5ff02577b2ddc622ea8045542fb7cbebad1f5593870dce98bca0b7", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b47c064c64cf878d311ec2d9753b314a355d43775f9f03f0bb3b1951236a44ca", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48b3b40796a99309794aa040cbffcad0db93631693c0fcacb9fbc01e25c5b8f0", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eda3ac4d4314d4a4190a41f9453afcfbd9da6c6da25dd7c1df9c6b75f4cafff3", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f74b3bacebbb1d613b346eef91e66bb0d8a28af18a23eb560d8eef0034793b5e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33a082238bf2c33d51fdd84cd48865183e35f4c748d6ed63f3f26888084c4c9a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:162e23b689665ebbcc0db116f5fb8d4cd59615501876b9594622ad097e3d2829", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5651d8060c94e76af8a5d0d80d33c73ea91aa7c3ad854de466f15cf90d6063a", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85b1a3b9d580e6ce1116bd8406906b1a559bbc9cd18d8c134aa303d405877564", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:838c51fa548ee3a76270281cece4b9454fe71bbb10d1c0f40b810b11f3f3e34e" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f2efb408e080f37d97bac76e056d3b7212000b0642a6c0a46c20f723d618e5e" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 565ea76017..166a8410d9 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.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:7f54cb834e5ff02577b2ddc622ea8045542fb7cbebad1f5593870dce98bca0b7" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5651d8060c94e76af8a5d0d80d33c73ea91aa7c3ad854de466f15cf90d6063a" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index f2b85309a6..e9f841bd5e 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:51b2af82566153af1398888523cc726015af6c712f66bc65f8d9368fd37b7a39" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f09c7c987f0efa348a6079cc780e718e9a6bc61c7beefd528e69f1db0f89000" 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 b4ae780d6e..d4a689dd5d 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,18 +1,131 @@ -- api embedded-component b0658d22beea435e3a576165207416842cb2753b to e010a985205d75f9ff375051c6886afe0e4db220 - - d2da55fd 2026-04-11T19:04:53Z make update - - 26fd6324 2026-04-11T19:04:53Z postpone the removal of the DeploymentConfig API +- api embedded-component e010a985205d75f9ff375051c6886afe0e4db220 to ca354f9a48c94558e968a2411a7ddb88cad48be5 + - 3ea7135c 2026-04-17T15:12:35+02:00 CNTRLPLANE-2796: promote the event-ttl feature -- machine-config-operator embedded-component 5b0cdfd2162dcd354e4ff9f31286c5b5bff3f1dc to 042006de3967c7b187614eaaf88d197be4d4052f - - f43b49df 2026-04-07T12:27:13Z OCPBUGS-78154: Add GetDefaultLeaderElectionConfig for MCC - - aaa1b45d 2026-04-07T12:27:13Z OCPBUGS-78154: Log when using HA default leader election timings - - e6841a59 2026-04-07T12:27:13Z OCPBUGS-78154: Add useDefaultTimings flag to GetLeaderElectionConfig - - 79a9f6fe 2026-04-07T12:27:13Z Trim comment in GetLeaderElectionConfig. - - ff9c7f3d 2026-04-07T12:27:12Z OCPBUGS-78154: Use HA leader election defaults for MCO on SNO. - - 47cc7a3e 2026-04-03T22:28:34Z Move state logging to updateConfigAndState after SetDone +- cluster-csi-snapshot-controller-operator embedded-component 43ad01e88038be54792f16f0d692b96da1244404 to 8c1ebc60a2014ab925cbad6ef255e06ea0bd72b4 + - 708b7c8 2026-04-13T07:21:08Z Fix PDB unhealthyPodEvictionPolicy field name -- ovn-kubernetes image-amd64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3 to 020d072048b272c3ac77470b9a302cfd8ca0559e - - 581bfdef 2026-03-31T15:22:33+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison +- cluster-network-operator embedded-component 259ea6b026f6663fa720a1e11c913a61122402f9 to bf38adbf16e68196077430da0fa282d6d5fd33de + - 76e5c5c 2026-03-27T20:39:47Z wait for patch port to apply drop garp flows -- ovn-kubernetes image-arm64 0fd9d309727f67d7648d0fbfa29bdbbdfdf14ae3 to 020d072048b272c3ac77470b9a302cfd8ca0559e - - 581bfdef 2026-03-31T15:22:33+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison +- ovn-kubernetes image-amd64 020d072048b272c3ac77470b9a302cfd8ca0559e to 7c694144eff2e877d752e7f005bc289448fff7a0 + - eafe465f 2026-02-26T21:15:00-08:00 add ListNetworks() method to openshift infra provider + - d92494bc 2026-02-27T05:02:56Z sync test annotations with upstream changes + - 845456d0 2026-02-26T11:45:03-05:00 Moves OVN-K to CNI 1.1.0 + - 99107d33 2026-02-25T15:58:14-05:00 Implements DPU Health Check + - 721400a4 2026-02-25T13:07:13+01:00 (B)ANP conformance: update framework to use retries + - 15d73b3d 2026-02-25T13:02:47+01:00 Revert "(B)ANP conformance: update framework to use retries" + - 3c67139a 2026-02-25T12:53:36+01:00 (B)ANP conformance: update framework to use retries + - 0b82e64f 2026-02-24T22:28:05-06:00 docs: user-defined-network: Fix 'l2-UDN' image link + - 9d7b70f8 2026-02-24T22:28:05-06:00 docs: user-defined-networks: Fix markdown syntax + - 533f66e7 2026-02-24T15:16:57-05:00 Fix UDN network controller deadlock due to stopChan nil race + - d033767f 2026-02-24T15:09:36Z Add Nutanix to adopters page + - ca967b82 2026-02-23T15:27:32-05:00 Adds unit test for stale ICMP network policy ACL + - 69afd47b 2026-02-23T09:51:35-05:00 Adds E2E testing for ICMP NP bypass + - 63468cc8 2026-02-23T08:56:01-05:00 Adds kind.sh and helm support for --allow-icmp-network-policy + - bcb7ec91 2026-02-22T02:34:12-08:00 Allow emitting metrics on a single endpoint + - 25a4e056 2026-02-20T16:52:44-05:00 docs: Add section on how to debug coredumps from non-go binaries + - 58c5dc93 2026-02-20T10:21:03-05:00 Adds support for bypassing network policy for ICMP/ICMPv6 + - 75d2f8e4 2026-02-19T15:16:11-05:00 e2e: fix static IP collision in ValidatingAdmissionPolicy test + - 843ceff7 2026-02-19T12:05:16-05:00 Trivial E2E egress IP fixes + - fd270158 2026-02-19T17:58:44+01:00 Minimize ACLs by combining ipBlocks into single ACL + - 7feb1238 2026-02-19T10:35:47-05:00 Continue trying to assign egressIP on conflict + - 3b98daec 2026-02-19T10:35:47-05:00 Fixes race with egress ip + node ip mgr + - 2b1f4a84 2026-02-18T16:09:12-05:00 e2e: clean up stale networks before VRF-Lite BGP tests + - 2d3e48b7 2026-02-18T15:01:34-05:00 Adds benchmark test for OpenFlow stream reader + - 91375531 2026-02-18T15:01:34-05:00 Reduce memory allocation by OpenFlow Manager + - 005e15b8 2026-02-18T08:40:21-08:00 add unit tests for stale primary UDN cleanup + - 9caab0e4 2026-02-18T08:40:21-08:00 cleanup logical entities for stale primary networks + - d1daa85d 2026-02-18T10:30:50-05:00 E2E: Fixes flaking ANP ACL logging + - 24efc26e 2026-02-18T16:28:57+01:00 Reuse test setup across BGP isolation table entries + - 32cbabcd 2026-02-18T16:28:57+01:00 Speed up BGP isolation e2e tests + - d9888a12 2026-02-18T15:48:20+05:30 fix live migration link navigation + - 447b8d18 2026-02-17T12:08:37+01:00 Mention -add-ovs-collector to start sampling + - 56f2d8d8 2026-02-16T11:45:25+01:00 Update OVN observability documentation + - c2c8e8e5 2026-02-16T08:31:35+01:00 Reduce obj_retry.go log spam + - 7606fd88 2026-02-16T08:30:48+01:00 CUDN: cleanup NADs in terminating namespaces without pods + - 32f5e7c5 2026-02-15T12:02:26-05:00 Fixes Egress IP Tracker UT + - 16480b9e 2026-02-14T09:10:20+08:00 fix issues for adding SAIC Motor to Adopters + - b95fc808 2026-02-13T12:05:23-05:00 Fixes gateway egress IP node update logic + - 3cfbafff 2026-02-13T12:05:23-05:00 Fix hybrid overlay mutating informer pod object + - 0e44890d 2026-02-13T12:05:23-05:00 EgressIP: Fix crash from mutating node informer object + - a760e77b 2026-02-13T12:03:11-05:00 Improve EgressFW subnet parsing + - 16240491 2026-02-13T12:03:11-05:00 GetActiveNetworkForNamespace Refactor + - 67dfeafe 2026-02-13T12:03:11-05:00 egressip: trigger immediate retry when UDN pod port cache is populated + - 90e65d62 2026-02-13T12:03:11-05:00 egressip: force pod assignment reprogram when pod IP changes + - a114896d 2026-02-13T12:03:11-05:00 E2E: Add integration UDN test + - 9ab81e57 2026-02-13T12:03:11-05:00 Bring EgressIP inline with NAD Reconciliation + - f1a65d47 2026-02-13T12:03:11-05:00 Fix EgressFirewall GetActiveNetworkForNamespace + - 3ae25d25 2026-02-13T12:03:11-05:00 Guard GetPrimaryNADForNamespace when netseg not enabled + - b79e6f94 2026-02-13T12:03:11-05:00 Fix Dynamic UDN with services controller + - e624ec9d 2026-02-13T12:03:11-05:00 Fix GetActiveNetworkForNamespace usage for NetPol + - e95dc868 2026-02-13T12:03:11-05:00 Make node gateway Dynamic UDN aware + - 6f78d1d2 2026-02-13T17:56:21+01:00 Handle Docker 29+ "invalid IP" response for IP addresses + - 31ee5d7b 2026-02-13T21:32:16+08:00 Add SAIC Motor to ADOPTERS + - 2edd4307 2026-02-13T01:44:34-08:00 fix kind load docker-image content digest not found + - e527aa80 2026-02-12T10:03:24-05:00 Adds DPU blog + - 6ddb8b76 2026-02-12T12:36:15Z Handle stale PCI address in mgmt port Init for DPU Host case + - 0974f2e8 2026-01-27T16:17:13-08:00 Unify the metrics servers used by ovnkube-node and OVS/OVN metrics + - 1d5e616b 2026-01-23T10:57:13-05:00 Improve nodenft.MatchNFTRules behavior + - 809ad111 2026-01-19T15:18:32-05:00 Use `nft destroy` to simplify the UDN cleanup code + +- ovn-kubernetes image-arm64 020d072048b272c3ac77470b9a302cfd8ca0559e to 7c694144eff2e877d752e7f005bc289448fff7a0 + - eafe465f 2026-02-26T21:15:00-08:00 add ListNetworks() method to openshift infra provider + - d92494bc 2026-02-27T05:02:56Z sync test annotations with upstream changes + - 845456d0 2026-02-26T11:45:03-05:00 Moves OVN-K to CNI 1.1.0 + - 99107d33 2026-02-25T15:58:14-05:00 Implements DPU Health Check + - 721400a4 2026-02-25T13:07:13+01:00 (B)ANP conformance: update framework to use retries + - 15d73b3d 2026-02-25T13:02:47+01:00 Revert "(B)ANP conformance: update framework to use retries" + - 3c67139a 2026-02-25T12:53:36+01:00 (B)ANP conformance: update framework to use retries + - 0b82e64f 2026-02-24T22:28:05-06:00 docs: user-defined-network: Fix 'l2-UDN' image link + - 9d7b70f8 2026-02-24T22:28:05-06:00 docs: user-defined-networks: Fix markdown syntax + - 533f66e7 2026-02-24T15:16:57-05:00 Fix UDN network controller deadlock due to stopChan nil race + - d033767f 2026-02-24T15:09:36Z Add Nutanix to adopters page + - ca967b82 2026-02-23T15:27:32-05:00 Adds unit test for stale ICMP network policy ACL + - 69afd47b 2026-02-23T09:51:35-05:00 Adds E2E testing for ICMP NP bypass + - 63468cc8 2026-02-23T08:56:01-05:00 Adds kind.sh and helm support for --allow-icmp-network-policy + - bcb7ec91 2026-02-22T02:34:12-08:00 Allow emitting metrics on a single endpoint + - 25a4e056 2026-02-20T16:52:44-05:00 docs: Add section on how to debug coredumps from non-go binaries + - 58c5dc93 2026-02-20T10:21:03-05:00 Adds support for bypassing network policy for ICMP/ICMPv6 + - 75d2f8e4 2026-02-19T15:16:11-05:00 e2e: fix static IP collision in ValidatingAdmissionPolicy test + - 843ceff7 2026-02-19T12:05:16-05:00 Trivial E2E egress IP fixes + - fd270158 2026-02-19T17:58:44+01:00 Minimize ACLs by combining ipBlocks into single ACL + - 7feb1238 2026-02-19T10:35:47-05:00 Continue trying to assign egressIP on conflict + - 3b98daec 2026-02-19T10:35:47-05:00 Fixes race with egress ip + node ip mgr + - 2b1f4a84 2026-02-18T16:09:12-05:00 e2e: clean up stale networks before VRF-Lite BGP tests + - 2d3e48b7 2026-02-18T15:01:34-05:00 Adds benchmark test for OpenFlow stream reader + - 91375531 2026-02-18T15:01:34-05:00 Reduce memory allocation by OpenFlow Manager + - 005e15b8 2026-02-18T08:40:21-08:00 add unit tests for stale primary UDN cleanup + - 9caab0e4 2026-02-18T08:40:21-08:00 cleanup logical entities for stale primary networks + - d1daa85d 2026-02-18T10:30:50-05:00 E2E: Fixes flaking ANP ACL logging + - 24efc26e 2026-02-18T16:28:57+01:00 Reuse test setup across BGP isolation table entries + - 32cbabcd 2026-02-18T16:28:57+01:00 Speed up BGP isolation e2e tests + - d9888a12 2026-02-18T15:48:20+05:30 fix live migration link navigation + - 447b8d18 2026-02-17T12:08:37+01:00 Mention -add-ovs-collector to start sampling + - 56f2d8d8 2026-02-16T11:45:25+01:00 Update OVN observability documentation + - c2c8e8e5 2026-02-16T08:31:35+01:00 Reduce obj_retry.go log spam + - 7606fd88 2026-02-16T08:30:48+01:00 CUDN: cleanup NADs in terminating namespaces without pods + - 32f5e7c5 2026-02-15T12:02:26-05:00 Fixes Egress IP Tracker UT + - 16480b9e 2026-02-14T09:10:20+08:00 fix issues for adding SAIC Motor to Adopters + - b95fc808 2026-02-13T12:05:23-05:00 Fixes gateway egress IP node update logic + - 3cfbafff 2026-02-13T12:05:23-05:00 Fix hybrid overlay mutating informer pod object + - 0e44890d 2026-02-13T12:05:23-05:00 EgressIP: Fix crash from mutating node informer object + - a760e77b 2026-02-13T12:03:11-05:00 Improve EgressFW subnet parsing + - 16240491 2026-02-13T12:03:11-05:00 GetActiveNetworkForNamespace Refactor + - 67dfeafe 2026-02-13T12:03:11-05:00 egressip: trigger immediate retry when UDN pod port cache is populated + - 90e65d62 2026-02-13T12:03:11-05:00 egressip: force pod assignment reprogram when pod IP changes + - a114896d 2026-02-13T12:03:11-05:00 E2E: Add integration UDN test + - 9ab81e57 2026-02-13T12:03:11-05:00 Bring EgressIP inline with NAD Reconciliation + - f1a65d47 2026-02-13T12:03:11-05:00 Fix EgressFirewall GetActiveNetworkForNamespace + - 3ae25d25 2026-02-13T12:03:11-05:00 Guard GetPrimaryNADForNamespace when netseg not enabled + - b79e6f94 2026-02-13T12:03:11-05:00 Fix Dynamic UDN with services controller + - e624ec9d 2026-02-13T12:03:11-05:00 Fix GetActiveNetworkForNamespace usage for NetPol + - e95dc868 2026-02-13T12:03:11-05:00 Make node gateway Dynamic UDN aware + - 6f78d1d2 2026-02-13T17:56:21+01:00 Handle Docker 29+ "invalid IP" response for IP addresses + - 31ee5d7b 2026-02-13T21:32:16+08:00 Add SAIC Motor to ADOPTERS + - 2edd4307 2026-02-13T01:44:34-08:00 fix kind load docker-image content digest not found + - e527aa80 2026-02-12T10:03:24-05:00 Adds DPU blog + - 6ddb8b76 2026-02-12T12:36:15Z Handle stale PCI address in mgmt port Init for DPU Host case + - 0974f2e8 2026-01-27T16:17:13-08:00 Unify the metrics servers used by ovnkube-node and OVS/OVN metrics + - 1d5e616b 2026-01-23T10:57:13-05:00 Improve nodenft.MatchNFTRules behavior + - 809ad111 2026-01-19T15:18:32-05:00 Use `nft destroy` to simplify the UDN cleanup code diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 1d2ac87703..80b8fea332 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,11 +1,11 @@ -https://github.com/openshift/api embedded-component e010a985205d75f9ff375051c6886afe0e4db220 -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 43ad01e88038be54792f16f0d692b96da1244404 +https://github.com/openshift/api embedded-component ca354f9a48c94558e968a2411a7ddb88cad48be5 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8c1ebc60a2014ab925cbad6ef255e06ea0bd72b4 https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9 https://github.com/openshift/cluster-ingress-operator embedded-component c2ed7331f378e499b2092f04ca7aaf8b3a075274 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8ee10fb411a0c7f0e91b3e6d9e3bd3843a93e882 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 395de96705749de9c6a5f25747b9d5c3d5f65a8f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e60e39de9cdd273dadd341d0f56350f504db9623 -https://github.com/openshift/cluster-network-operator embedded-component 259ea6b026f6663fa720a1e11c913a61122402f9 +https://github.com/openshift/cluster-network-operator embedded-component bf38adbf16e68196077430da0fa282d6d5fd33de https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2617a201bb3607192a9f82faa18384676f611e3c https://github.com/openshift/cluster-policy-controller embedded-component 8b775487512fb543bff470ff1042bd3ac31b29be https://github.com/openshift/csi-external-snapshotter embedded-component 9098db0e434e0d986eeadd2ebe69119540a550d1 @@ -22,7 +22,7 @@ https://github.com/openshift/coredns image-amd64 7486e9e4330c1e41d9a91e4673b7f27 https://github.com/openshift/csi-external-snapshotter image-amd64 9098db0e434e0d986eeadd2ebe69119540a550d1 https://github.com/openshift/router image-amd64 5949f713517b3cc158cd78b34d71d5a9084d2e1c https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-amd64 020d072048b272c3ac77470b9a302cfd8ca0559e +https://github.com/openshift/ovn-kubernetes image-amd64 7c694144eff2e877d752e7f005bc289448fff7a0 https://github.com/openshift/kubernetes image-amd64 dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 https://github.com/openshift/oc image-arm64 9d9df34c46c9deba8c291a2a084de5724c0bd820 @@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f27 https://github.com/openshift/csi-external-snapshotter image-arm64 9098db0e434e0d986eeadd2ebe69119540a550d1 https://github.com/openshift/router image-arm64 5949f713517b3cc158cd78b34d71d5a9084d2e1c https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-arm64 020d072048b272c3ac77470b9a302cfd8ca0559e +https://github.com/openshift/ovn-kubernetes image-arm64 7c694144eff2e877d752e7f005bc289448fff7a0 https://github.com/openshift/kubernetes image-arm64 dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba https://github.com/openshift/service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 35377a8de5..8c17fcb7fe 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-2026-04-15-070853" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-04-16-010853" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-04-19-143007" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-04-20-030621"