From 7efc5265e02930d20282681393c43cef6a8bd305 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 29 Sep 2025 04:22:15 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index bc40aff1aa..a6a42847e9 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-25-082813" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-09-20-145748" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-09-27-154726" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-09-20-145748" From 717530a845cc29b7c33c0de50fbcbd2c77610a5a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 29 Sep 2025 04:22:16 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 176 +++--------------------------- scripts/auto-rebase/commits.txt | 14 +-- 2 files changed, 25 insertions(+), 165 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index a1955ddb62..14967b5f78 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,165 +1,25 @@ -- api embedded-component 83b017b06367bf8564bf94f5c6c1ad8aed5d3ab9 to 8a46f746f2cf87624651e6e8a85421b49bef3b6e - - 70766206 2025-09-23T08:13:22-04:00 (bugfix): fix crdify generator to also return an aggregated error when validations fail - - 08bfa12c 2025-09-19T15:19:20-04:00 add union discriminator for manual mode - - bcad2088 2025-09-18T16:44:05-04:00 cross-validate boot images & skew enforcement - - de957683 2025-09-18T16:44:05-04:00 machine_config: add BootImageSkewEnforcement API - - 206d340a 2025-09-16T14:24:40-04:00 tooling: add crdify generator to run crdify against CRD changes - - 21152dba 2025-09-12T13:57:46-04:00 MachineConfigNode: add 'AGE' print column - - e278f008 2025-09-12T09:53:41+02:00 feat: remove unused feature gate InsightsConfigAPI +- api embedded-component 8a46f746f2cf87624651e6e8a85421b49bef3b6e to 1517fca97fe327e076bcff90accb86d1f4e804ed + - 27fba57a 2025-09-25T11:34:01-04:00 Fix: Updated the printer column entry + - ca5ca565 2025-09-25T11:22:14-04:00 Updated column type from string to date -- cluster-ingress-operator embedded-component c968596268df58ed8747a8f88ebb8c501824bbb2 to 69ba323f05c84f72f11a0d086836b3f3412512d4 - - 6fc40ec 2025-09-18T12:29:38-03:00 OCPBUGS-55649: Remove SetEIPForNLBIngressController feature gate +- cluster-csi-snapshot-controller-operator embedded-component 3880c9659829c9904e58a943050e8dfd4c9a79cb to 4fc005e0450a90473def2a18414ef4e5f6e7a374 + - 8560024 2025-09-25T10:19:36-06:00 OCPBUGS-62247: add all-egress label to deployments on HCP and IBM -- cluster-kube-apiserver-operator embedded-component 25092d8447b0186402dcf2a6564f6ac2ebf55c9b to 6333489fd7d8d3494372cb830efba40eb28e45c1 - - dbfd6c0 2025-09-19T12:39:23+02:00 OCPBUGS-15430: move alerting rules from CMO over - - feb3d9e 2025-09-01T08:56:32+02:00 certrotation: update description for control-plane-node-kubeconfig certificate keypair - - c5e5e5b 2025-08-28T21:01:35+02:00 certrotation: fix typo - - c88e363 2025-08-28T20:34:38+02:00 Revert "Revert "OCPBUGS-57049: certrotation: move test case name outside of AutoRegenerateAfterOfflineExpiry"" +- cluster-kube-controller-manager-operator embedded-component a92da07ac1f335c148411c838dd2982c9ca90988 to 5a7a19516b3fabb83213776683d7f5d6cb61ca3a + - d275cdf 2025-09-25T12:27:14-04:00 Throttle resourcesynccontroller on pairs with dual writers. -- cluster-network-operator embedded-component c069f36d58d9d8ad4a9cd23a410fb263a5e689ed to 23c976c3ae4a9db28a6c2714840bc71bb0ed20c5 - - 966cc52 2025-09-14T10:44:04-04:00 Add a ValidatingAdmissionPolicy blocking ServiceCIDR changes +- cluster-network-operator embedded-component 23c976c3ae4a9db28a6c2714840bc71bb0ed20c5 to 6f6d0ee4a020c1cb971d63bc8f68d9f7792dc802 + - 2b9d5c2 2025-09-19T11:06:30+02:00 Add drop flows for GARPs -- cluster-policy-controller embedded-component 0e2948510331ff9351c5eb6d7f2f440afc7aa17a to 5c0dd7a1b366d314aa9c929fe775ee3041b348cb - - 3ffb457 2025-08-26T14:06:58+02:00 fix(psalabelsyncer): return an error instead of panic when converting an unknown volume +- machine-config-operator embedded-component 733131d0113f142aa90172c8e6d653491d2c333f to 4f149432701861a0e577a4f457f99d94b9914cfe + - ae9246e2 2025-09-23T16:52:39+02:00 MCO-1685: Add mco-sanitize file processing logic -- kubernetes embedded-component 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e to 5c9df339496a7595967e06682ece7d0b2145411c - - 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. +- oc image-amd64 0e4fabc98dc46c9fca79544297783053a49370ce to abe2393074469d1ecbd42694442e43b129f63a84 + - 6a2ebc9d 2025-09-22T13:44:04+02:00 must-gather: Add support for context + - 1f1fbf4b 2025-09-22T13:36:34+02:00 must-gather: Call queue.Done at the right time + - 7a94ed98 2025-09-22T13:34:11+02:00 must-gather: Do cleanup on role binding error + - c1fa7881 2025-09-22T13:32:09+02:00 must-gather: Use NewTypedRateLimitingQueue -- machine-config-operator embedded-component 223bed017865d085a6fda3a41050627be96ed340 to 733131d0113f142aa90172c8e6d653491d2c333f - - 54677883 2025-09-23T15:14:32+02:00 MCO-1685: Add mco-sanitize redactor - - 4fb52433 2025-09-18T10:32:09-04:00 test/extended: add azure e2es - - 9c040309 2025-09-18T10:30:26-04:00 test/extended: add boot image test helpers - - 7c64bec0 2025-09-09T20:53:05-04:00 controller: update is node done check to handle image mode disabling case & add unit test cases for scenario - -- 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 - -- operator-framework-olm embedded-component 44c993131781ff5bfb8665b0e6cc1d2a3bf23839 to 0b07ab92a28d0377c6600d0b40c5486b4b942ca1 - - 59ec2818 2025-09-20T00:03:50+00:00 Improves quickstart docs to use latest manifests (#3658) - - c126c418 2025-09-18T12:37:43+08:00 add testing framework based on OTE and the first tests-private case - -- route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20 to 9f4b06c555c177a7d3bf96c4b407f7c76c4492e4 - - cb30401 2025-09-23T11:22:10-03:00 NOJIRA: Remove old OWNERS file - - f8aac39 2025-09-23T11:22:06-03:00 NOJIRA: Add new team members to OWNERS - -- router image-amd64 2c1a6790a4208cea7b8809ebdba3d2a8223827a8 to 4ab58e470655440e32e82f89c2856fd2100b00ae - - 84b4a48 2025-09-19T09:40:58-03:00 NE-2137: Bump router k8s libraries to 0.33.4 - vendor - - cfc2fd4 2025-09-19T09:40:46-03:00 NE-2137: Bump router k8s libraries to 0.33.4 - - 144665f 2025-09-17T11:44:06-04:00 Keep go indentation the same, w/ same final output - - a2c957e 2025-09-16T13:29:07-04:00 OCPBUGS-60257: fix extra space in haproxy template - - 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 - -- ovn-kubernetes image-amd64 5ad762f86466c2e11b94da2cee211cec97e16a3a to e71219323b38af7afff0710a815a539260832550 - - 6dced5ec 2025-09-19T17:11:36+02:00 Revert "multi-homing, tests: do not use OVN provided IPAM in L3 nets" - - fea3444d 2025-09-10T18:25:29+02:00 Fix EgressIP controller deadlock by sorting node locks lexicographically - - e60220a6 2025-09-09T15:46:41+01:00 Node controller shutdown: do not ref gateway if not set - - db8b2aef 2025-09-09T15:29:38+02:00 Fetch agnhost image from k8s upstream - - 46bcb452 2025-09-09T14:14:31+02:00 expand EgressIP limitations and solution - - d45ffccc 2025-09-09T14:14:31+02:00 Rename ovn_cluster_router to transit_router - - 27b1f317 2025-09-09T14:14:31+02:00 layer2 router topology: describe upgrade - - c655cbf3 2025-09-09T14:14:31+02:00 enhancement: Improve layer2 topology for VMs - - e717e423 2025-09-08T18:56:38+02:00 Replace 0/1 index var to utilnet ipFamily - - d268c014 2025-09-08T18:56:38+02:00 Skip Multi Homing tests on ipv6 singlestack BGP lane - - b9ecb33f 2025-09-08T18:56:38+02:00 Fix bgp tests to work on single stack ipv6 - - 8000cfd6 2025-09-08T18:56:38+02:00 Add singlestack ipv6 bgp lane - - 1bbb7f32 2025-09-08T18:56:37+02:00 Add e2e test towards kapi ipv6 address from udn pods - - e2625f41 2025-09-08T18:56:37+02:00 Make ip and ipv6 constants in flow code - - 1f6964cf 2025-09-08T18:56:37+02:00 Consider more than 1 family serviceCIDR range for UDN service flows - - 38935ee6 2025-09-08T18:56:37+02:00 Fix UDN service CIDR flows that had protocol prefix pinned to `ip` - - 7eed13ba 2025-09-05T18:41:39+01:00 E2Es: dont panic when unable to find a deployment config - - 221205d3 2025-09-05T16:34:58+05:30 Add UDN subnet overlap check with transit switch subnet - - 4ffa27b2 2025-09-05T10:07:54+02:00 Update maintainers affiliation - - 35659ebd 2025-09-04T15:31:52+01:00 E2E: remove node selector from new e2e tests - - 2670efee 2025-09-04T15:31:52+01:00 E2E: fixup e2es without a feature label - - afe4ca59 2025-09-04T15:31:08+01:00 E2Es: use 'app' instead of 'name' when selecting ovn-k node pods - - 4f5fcc83 2025-09-04T15:04:36+01:00 Change UDN networks to relatively rare CIDR - - ad905eaf 2025-09-04T15:11:35+03:00 [kind] Bump kubevirt/ipam-extensions version to v0.3.1 - - 53e6851f 2025-09-04T08:35:00+01:00 E2Es: pass kconfig to detect deployment conf - - 481e954b 2025-09-04T09:55:59+03:00 test/e2e/preconfigured_layer2: Add duplicate IP Validation pod tests - - 9b16a7f9 2025-09-03T20:29:23+03:00 test/e2e/kubevirt: Add duplicate IP Validation test - - 66298cff 2025-09-03T20:29:23+03:00 pod_annotations: Block duplicate IP on new pods - - 6653d552 2025-09-03T10:19:01+01:00 fix: swap quay.io golang image provider - - b004ed09 2025-09-02T20:46:30+02:00 E2E localnet: send three pings instead of just one - - dea42b40 2025-09-02T20:46:30+02:00 E2E localnet: localnet -> host network on VLAN with external router - - 51eae7a9 2025-09-02T20:46:30+02:00 E2E localnet: host network -> localnet on VLAN with external router - - 69ec5696 2025-09-02T20:46:30+02:00 E2E localnet: default network->localnet on VLAN with external router - - f82e1019 2025-09-02T20:46:30+02:00 E2E localnet: Fix requirement on number of schedulable nodes - - eb5f3c10 2025-09-02T20:46:30+02:00 E2E localnet: make IP request for localnet pod extensible - - c4cc25a0 2025-09-02T20:46:30+02:00 E2E localnet: specify that the localnet uses IPs from host subnet - - 6de44ef6 2025-09-02T20:46:30+02:00 E2E localnet: remove references to downstream bugs and stories - - bf6f9c16 2025-09-02T20:46:30+02:00 Configure existing multihoming CI lane as IC-enabled and shared gw - - a5029f87 2025-09-02T20:46:30+02:00 E2E: add test host -> localnet with IP in host subnet - - 4ce92a90 2025-09-02T20:46:30+02:00 E2E localnet: remove double import of ginkgo - - ef1aa996 2025-09-02T20:46:30+02:00 Openflow: lookup conntrack & table=1 when breth0 is next hop (IPv6) - - 66d8f142 2025-09-02T20:46:30+02:00 Openflow: drop in_port from IPv6 dispatch OF rule at prio=50 - - 318f8ce3 2025-09-02T20:46:30+02:00 Openflow: lookup conntrack & table=1 only when breth0 is next hop - - d70e444e 2025-09-02T16:38:34+02:00 fix: Skip node-encap-ips annotation in DPU host mode - - c0c1b266 2025-09-01T10:45:12+01:00 multi-homing, tests: do not use OVN provided IPAM in L3 nets - - 9633bdfa 2025-09-01T11:10:30+03:00 fix: run go mod tidy e2e tests - - 320b2fae 2025-09-01T11:10:29+03:00 fix: routemanager unit tests - - bc4f9b80 2025-09-01T11:10:27+03:00 chore: bump sriovnet lib - - 82fc3bf7 2025-08-27T16:38:56+01:00 ovn-controller: block GARP during startup - - 8b294197 2025-08-27T16:37:52+01:00 Fix ovnkube-controller-with-node shutdown sequence - - 46fa3304 2025-08-27T10:04:05-04:00 Update docs for UDN - - a44f6c12 2025-08-27T10:04:05-04:00 Updates UDN Isolation DBIDs - - a393d95c 2025-08-26T12:13:54-04:00 A couple of minor fixes - - bbca8743 2025-08-26T12:13:54-04:00 Fix naming of "Secondary" to be "User-Defined" - - 45765c51 2025-08-25T14:11:18-07:00 fix intermittent disk space issue - -- kubernetes image-amd64 95b8140e3a53ffc6aab114c39e07a439dfdf7f9e to 5c9df339496a7595967e06682ece7d0b2145411c - - 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. - -- 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 - -- coredns image-arm64 6f39336e6da9dc77b2db140a96773c413d50a665 to 42e2cf1e46dfd9dd11669b06fb1d619cd9335e17 - - 6e38175 2025-09-15T16:48:48-04:00 Add bentito (btofel@redhat.com) to OWNERS - -- router image-arm64 2bc8169c87ccd69cceeeab7552bedb6f16a34c84 to 846c6ca6d4222fd0fcd7891edb66dcf226f61c45 - - c153dfe 2025-09-15T16:49:10-04:00 Add bentito (btofel@redhat.com) to OWNERS - - 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 - -- kubernetes image-arm64 b59afbdc1eb4ecb7c8b19b8cc95c4657df6caf6d to 5c9df339496a7595967e06682ece7d0b2145411c - - bd238e196 2025-09-17T10:47:16-04:00 UPSTREAM: : Add retries for GetCurrentResourceVersion. - - 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 +- router image-amd64 4ab58e470655440e32e82f89c2856fd2100b00ae to 48642ee220fe9cf5842a46ea1283817f0f2b7272 + - 665df70 2025-09-22T15:54:29-03:00 OCPBUGS-49769: Validate the key and cert content before accepting diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index a63f104190..49bfd7fe0f 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,26 +1,26 @@ -https://github.com/openshift/api embedded-component 8a46f746f2cf87624651e6e8a85421b49bef3b6e -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 3880c9659829c9904e58a943050e8dfd4c9a79cb +https://github.com/openshift/api embedded-component 1517fca97fe327e076bcff90accb86d1f4e804ed +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 4fc005e0450a90473def2a18414ef4e5f6e7a374 https://github.com/openshift/cluster-dns-operator embedded-component 1272aef21dd5dcdbefbf4888c7b0a4a427683fd7 https://github.com/openshift/cluster-ingress-operator embedded-component 69ba323f05c84f72f11a0d086836b3f3412512d4 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 6333489fd7d8d3494372cb830efba40eb28e45c1 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a92da07ac1f335c148411c838dd2982c9ca90988 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5a7a19516b3fabb83213776683d7f5d6cb61ca3a https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 2345371abed5896006ac4a60c7d555fc25502c0a -https://github.com/openshift/cluster-network-operator embedded-component 23c976c3ae4a9db28a6c2714840bc71bb0ed20c5 +https://github.com/openshift/cluster-network-operator embedded-component 6f6d0ee4a020c1cb971d63bc8f68d9f7792dc802 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component da1e14c45093c19bc79e2055c9f4a55efc1cc1a8 https://github.com/openshift/cluster-policy-controller embedded-component 5c0dd7a1b366d314aa9c929fe775ee3041b348cb https://github.com/openshift/csi-external-snapshotter embedded-component ba8194d5920973069bc56a8bf5844afeedc66bbd https://github.com/openshift/etcd embedded-component 9c065d4d842c8de57806426c13201413b4d595e2 https://github.com/openshift/kubernetes embedded-component 5c9df339496a7595967e06682ece7d0b2145411c https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953 -https://github.com/openshift/machine-config-operator embedded-component 733131d0113f142aa90172c8e6d653491d2c333f +https://github.com/openshift/machine-config-operator embedded-component 4f149432701861a0e577a4f457f99d94b9914cfe https://github.com/openshift/openshift-controller-manager embedded-component 15fc552a73e47ae715f0cf59e3f535e26b43477a https://github.com/openshift/operator-framework-olm embedded-component 0b07ab92a28d0377c6600d0b40c5486b4b942ca1 https://github.com/openshift/route-controller-manager embedded-component 9f4b06c555c177a7d3bf96c4b407f7c76c4492e4 https://github.com/openshift/service-ca-operator embedded-component a40d9a8ec60e0c6c1578300c372b6104130f2ecc -https://github.com/openshift/oc image-amd64 0e4fabc98dc46c9fca79544297783053a49370ce +https://github.com/openshift/oc image-amd64 abe2393074469d1ecbd42694442e43b129f63a84 https://github.com/openshift/coredns image-amd64 42e2cf1e46dfd9dd11669b06fb1d619cd9335e17 https://github.com/openshift/csi-external-snapshotter image-amd64 ba8194d5920973069bc56a8bf5844afeedc66bbd -https://github.com/openshift/router image-amd64 4ab58e470655440e32e82f89c2856fd2100b00ae +https://github.com/openshift/router image-amd64 48642ee220fe9cf5842a46ea1283817f0f2b7272 https://github.com/openshift/kube-rbac-proxy image-amd64 b9134351be37c43408334047d8eb85d0ac01fe4e https://github.com/openshift/ovn-kubernetes image-amd64 e71219323b38af7afff0710a815a539260832550 https://github.com/openshift/kubernetes image-amd64 5c9df339496a7595967e06682ece7d0b2145411c From 9f26885d81e96fd202b61d185259629991ef7b0c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 29 Sep 2025 04:23:20 +0000 Subject: [PATCH 3/4] update manifests --- .../csi_controller_deployment.yaml | 4 ++++ assets/components/multus/kustomization.x86_64.yaml | 4 ++-- assets/components/multus/release-multus-x86_64.json | 6 +++--- .../optional/kube-proxy/release-kube-proxy-x86_64.json | 2 +- .../operator-lifecycle-manager/release-olm-x86_64.json | 2 +- assets/release/release-x86_64.json | 10 +++++----- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml index 8d7fe03c61..2e9317dd56 100644 --- a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml +++ b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml @@ -25,6 +25,10 @@ spec: app: csi-snapshot-controller openshift.storage.network-policy.dns: allow openshift.storage.network-policy.api-server: allow + # Hypershift allows the API server port to be defined in + # hostedcluster.spec.networking.apiServer.port so in this case we add the + # all-egress network policy to allow reaching the server on any port. + openshift.storage.network-policy.all-egress: allow spec: securityContext: runAsNonRoot: true diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 4de30e9301..09affaec87 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:5eb436699513493dedcde08bbbdeb38314784e8890325005c12d259acc52f3f7 + digest: sha256:885afa33b297767f7cd28a548dae60946b606297ffa9f3f6c9fddbbf8b967f87 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b5d0a2a4c6b7d304bcd1f87314d908ef79543b6a0057b37dfbe2a4d1b0baf623 + digest: sha256:2b816c84b9e083efc96450a851ae9a7313182c3cd8be08964000a628531e74fc diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 392482332c..0f92a0a95d 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-2025-09-25-082813" + "base": "4.21.0-0.nightly-2025-09-27-154726" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5eb436699513493dedcde08bbbdeb38314784e8890325005c12d259acc52f3f7", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5d0a2a4c6b7d304bcd1f87314d908ef79543b6a0057b37dfbe2a4d1b0baf623" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:885afa33b297767f7cd28a548dae60946b606297ffa9f3f6c9fddbbf8b967f87", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b816c84b9e083efc96450a851ae9a7313182c3cd8be08964000a628531e74fc" } } 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 2ed5dc213e..ad9f0403b7 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-25-082813" + "base": "4.21.0-0.nightly-2025-09-27-154726" }, "images": { "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3fc8dfe457c80bc3b4e125511c20c08cb2d30056655e20130a019b561a49b7d" 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 48932a0d1d..6ebcb94c35 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-25-082813" + "base": "4.21.0-0.nightly-2025-09-27-154726" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01ef5da26da30db8c2bad60dd0a11f39bdadcab6fd8579cc1737a7ed8b1971cb", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 7aff93a1f9..797d41e4d6 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.21.0-0.nightly-2025-09-25-082813" + "base": "4.21.0-0.nightly-2025-09-27-154726" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:446b1cf7e5e5bbdc05dd61de90262919ed2207b56cc0a8bb75b29f8cdcae3f67", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3116bc104a0a51b8853bd371b7a708b76cbad189594906ca58fd0b7c8fe1c7b1", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afeba9e7f4cc1270010971f4cf8a3c0f213e7fd47a39c8d783eb597b7e029c32", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd59064838c9a7fe981bb161f6b3c86cc84e29f5cebf4e90a38e46a1ada532f9", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03beb385d0fcdd0090885da66a4b3283803c3a54586409ac684e76036027f0db", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d732aa48d32245cdfa4d9d9a52a346c8cc0b26603abd08f371a45c04c722bb5", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f610d61e0e95df4d2015203f6f958b0076aeb7abd11d685059c6cc7b0da7796", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f35e9df6d88d45cd05aca39b1ba566cdcc3830c0b81347313d4e79271e8b386", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d098e9d64a31b392c9c0dbe7caa61abbcb24621b97037dea2d2c9d0a9ce724c9", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:508e03d50ef04642f70a89113b0218d126dc157c77df53f76793500f6f5a0fd4", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae1cfb8b86c064c36c10c48eee29398f76e912de7977127ef717d1f4a1b97906", "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:0d7467707708d9cbcc63a8279e85b02150382d3fab9783b1818a48776b8ed90e" } From cb986355ca0169239e42806fd4995e9a543730ba Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 29 Sep 2025 04:23:21 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.x86_64.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index a225c0ac6e..c98bc34d24 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2025-09-25-082813 +OCP_VERSION := 4.21.0-0.nightly-2025-09-27-154726