openshift · openshift-merge-bot · Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025 · Mar 21, 2025
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-19-200021
+OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-20-200021
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-2025-03-19-160541
+OCP_VERSION := 4.19.0-0.nightly-2025-03-20-220245
diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json
@@ -3,13 +3,13 @@
     "base": "2.18.0"
   },
   "images": {
+    "vllm-gaudi-image": "quay.io/modh/vllm@sha256:db2aa1ea8d0fe550e1c3e333c37861ed894205263746bf373ab8d7453299a8c4",
+    "vllm-rocm-image": "quay.io/modh/vllm@sha256:05abd450806958f384fad2ca142b120f6a6edc2662b3627455f5dd2eb808a5b8",
     "caikit-tgis-image": "quay.io/modh/caikit-tgis-serving@sha256:3cbd01ca3c79de84eec111fa451fef6e2071d11c74550692d04862e45bc95e0a",
     "caikit-standalone-image": "quay.io/modh/caikit-nlp@sha256:0dce5563a84c0ec715c4486d17388fcf6b4968b19917b7a259cdb2fb7d4fdbb0",
     "tgis-image": "quay.io/modh/text-generation-inference@sha256:aebf545d8048a59174f70334dc90c6b97ead4602a39cb7598ea68c8d199168a2",
     "ovms-image": "quay.io/modh/openvino_model_server@sha256:428c00232cbf3b38a3929a0d22d0e13c6388ce353e3853cc2956d175eacf6724",
     "vllm-image": "quay.io/modh/vllm@sha256:4f1f6b5738b311332b2bc786ea71259872e570081807592d97b4bd4cb65c4be1",
-    "vllm-gaudi-image": "quay.io/modh/vllm@sha256:db2aa1ea8d0fe550e1c3e333c37861ed894205263746bf373ab8d7453299a8c4",
-    "vllm-rocm-image": "quay.io/modh/vllm@sha256:05abd450806958f384fad2ca142b120f6a6edc2662b3627455f5dd2eb808a5b8",
     "kserve-controller": "quay.io/modh/kserve-controller@sha256:d53b9bd146b6724d3d1048f4aa150deef9f75e4159228f531f5e56007bee8524",
     "kserve-agent": "quay.io/modh/kserve-agent@sha256:faa49dab2dabc88d7d098d0999c56f2a27cf89891aa3984ef7a9387afa846e3c",
     "kserve-router": "quay.io/modh/kserve-router@sha256:65fc0f323cbdebf822c7bb13552dc7ab223cb1a2cb2c849021b16d7482a76b51",

diff --git a/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml b/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml
@@ -1,5 +1,11 @@
 
 images:
+  - name: vllm-gaudi-image
+    newName: quay.io/modh/vllm
+    digest: sha256:db2aa1ea8d0fe550e1c3e333c37861ed894205263746bf373ab8d7453299a8c4
+  - name: vllm-rocm-image
+    newName: quay.io/modh/vllm
+    digest: sha256:05abd450806958f384fad2ca142b120f6a6edc2662b3627455f5dd2eb808a5b8
   - name: caikit-tgis-image
     newName: quay.io/modh/caikit-tgis-serving
     digest: sha256:3cbd01ca3c79de84eec111fa451fef6e2071d11c74550692d04862e45bc95e0a
@@ -15,9 +21,3 @@ images:
   - name: vllm-image
     newName: quay.io/modh/vllm
     digest: sha256:4f1f6b5738b311332b2bc786ea71259872e570081807592d97b4bd4cb65c4be1
-  - name: vllm-gaudi-image
-    newName: quay.io/modh/vllm
-    digest: sha256:db2aa1ea8d0fe550e1c3e333c37861ed894205263746bf373ab8d7453299a8c4
-  - name: vllm-rocm-image
-    newName: quay.io/modh/vllm
-    digest: sha256:05abd450806958f384fad2ca142b120f6a6edc2662b3627455f5dd2eb808a5b8
diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2025-03-19-200021"
+    "base": "4.19.0-0.nightly-arm64-2025-03-20-200021"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea1e801f53c7cb86011519dab3f10c5d52f9f92090d4afaa943c1d658db753d6",

diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-2025-03-19-160541"
+    "base": "4.19.0-0.nightly-2025-03-20-220245"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05",

diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2025-03-19-200021"
+    "base": "4.19.0-0.nightly-arm64-2025-03-20-200021"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806",

diff --git 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.19.0-0.nightly-2025-03-19-160541"
+    "base": "4.19.0-0.nightly-2025-03-20-220245"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887",

diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-arm64-2025-03-19-200021"
+    "base": "4.19.0-0.nightly-arm64-2025-03-20-200021"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b02f3e129c9405662d7a303082f6cc401dd5be3227a4582895d5dd7a37085a17",

diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.19.0-0.nightly-2025-03-19-160541"
+    "base": "4.19.0-0.nightly-2025-03-20-220245"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17638aea252a1fc15ba23f730fd4b361fe438bc24379e791893d845f7c255315",

diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,63 +1,12 @@
-- cluster-ingress-operator embedded-component 7dc12cf28557f8c80460435649cfc393761e0285 to 924279a66d42d633d658113846d68e8d3805ec26
-  - dd0fc42 2025-03-12T13:44:10-04:00 Manage OSSM operator subscription manually to ensure a compatible version is installed
-
-- cluster-kube-apiserver-operator embedded-component c13665bdedd2ee30d28ff83c187ea739d9b8094d to e41854880dcb1a9df3322c1494c93e9a9ac0babe
-  - b84db30 2025-03-14T08:27:10+01:00 Bump library-go
-
-- cluster-network-operator embedded-component b2f717758e01faa85ece045aaa63f65dbbce7d17 to 510b7508ad7a66d1742c5d9f83a4143fa860029c
-  - f7bf9bc 2025-03-14T09:03:49-04:00 Update managed Azure HCP cloud network config
-  - ea6db11 2025-03-11T11:43:10-04:00 Correct namespace ref and cert dir
-
-- etcd embedded-component bd0cae2096abb1d2087e858bbce3f9c06b215f8d to 80d288f7ccb6c11128e2d697e7d26805c487150b
-  - 0ad5ea55 2025-03-13T13:12:03-04:00 DOWNSTREAM: <carry>: OCPBUGS-50510: make hardware related timeout delay configurable
-
-- kubernetes embedded-component d6f2dd28529e5ecc8cdffaf443253f74382c2b60 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb
-  - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: <carry>: translate all existing rules to use filtering and the environemntSelector in the specs
-  - 40e44d8ef 2025-03-07T18:08:33+01:00 UPSTREAM: <carry>: Add volume group snapshot test driver
-
-- machine-config-operator embedded-component adafd58169f40eec1110a9fd47473457ca8e5f9d to fe8353e4ea7e72dfd69105069b870a37a87478ec
-  - ec772e1d 2025-03-17T14:42:33-05:00 removing uncessary bind mount option rw
-  - 1fa5eaa9 2025-03-17T10:51:48+01:00 Add crio dependency for ipsec.service
-  - 24175667 2025-03-17T10:51:48+01:00 Add ipsec connect wait service
-  - 8bec9078 2025-03-13T16:39:27-04:00 ensure that client configs are not mutable
-  - feb8d94a 2025-03-13T16:11:59-04:00 Fixing typos for MachineConfigNode
-  - f6c5964a 2025-03-13T10:49:46-04:00 Add scc label to arbitor crio-metrics-proxy
-  - 9773ac9c 2025-03-07T17:10:27-05:00 daemon: ensure ostree-finalize-staged is started before rebooting
-  - df2762b1 2025-03-07T10:54:52-05:00 add custom MCP support for MCN feature
-  - 3f3df1bc 2025-03-06T12:01:03+05:30 Set `Upgradeable=False` when cluster is on cgroup `v1`
-  - 76712800 2024-12-09T10:12:46-08:00 Give bonding slaves time to implicitly activate.
-  - a6773f61 2024-12-09T10:01:32-08:00 Revert "Race in configure-ovs.sh affects bonding interface configuration."
-  - 50817d16 2024-09-23T14:31:24-07:00 Race in configure-ovs.sh affects bonding interface configuration.
-
-- operator-framework-olm embedded-component 6dd1017cdc814695820aeeb95be6cc28d6c411b5 to e7c4a6900a8b47fef5bf8f5587b0088ba4a057c8
-  - 7fede92c 2025-03-15T00:06:46+00:00 Upgrade controller-gen from v0.17.0 to v0.17.2 (#411)
-  - c9a8c3ee 2025-03-15T00:05:56+00:00 upgraded google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 => v0.0.0-20250303144028-a0af3efb3deb (#410)
-  - 6da537e6 2025-03-15T00:05:43+00:00 Upgrade YQ version used from v4.28.1 to v4.45.1 (#412)
-  - 8201db95 2025-03-15T00:05:32+00:00 upgraded golang.org/x/oauth2 v0.23.0 => v0.27.0 (#408)
-  - c88fbfb1 2025-03-15T00:05:20+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.1 to 0.20.2 (#405)
-  - c4ea5699 2025-03-15T00:05:08+00:00 Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (#406)
-  - c785eb84 2025-03-15T00:04:56+00:00 Bump k8s libs to v0.32.2 (#404)
-  - c20c4425 2025-03-15T00:04:44+00:00 OCPBUGS#30001: Fix catalogsource typo for API docs (#402)
-  - aedc2ed7 2025-03-15T00:04:32+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.0 to 0.20.1 (#400)
-  - 8aa5195f 2025-03-15T00:04:20+00:00 Bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.20.0 (#396)
-  - 0cd7ddcc 2025-03-15T00:04:08+00:00 Bump k8s.io/apiextensions-apiserver from 0.32.0 to 0.32.1 (#394)
-  - 48463de1 2025-03-15T00:03:52+00:00 :seedling: Bump sigs.k8s.io/controller-runtime (#3533)
-  - 576ad78d 2025-03-15T00:03:35+00:00 :seedling: Bump github.com/operator-framework/api from 0.29.0 to 0.30.0 (#3534)
-  - 2daa1b4d 2025-03-14T00:06:42+00:00 :seedling: Bump github.com/containers/image/v5 from 5.34.1 to 5.34.2 (#3536)
-  - d13886a1 2025-03-14T00:05:31+00:00 :seedling: Bump github.com/prometheus/client_golang (#3535)
-  - 2c8292d8 2025-03-14T00:05:16+00:00 :seedling: Bump golang.org/x/net from 0.35.0 to 0.37.0 (#3537)
-  - 755cd694 2025-03-14T00:04:59+00:00 :seedling: Bump github.com/containers/image/v5 from 5.34.0 to 5.34.1 (#3527)
-  - 671718fb 2025-03-14T00:04:44+00:00 Update OWNERS - remove stevekuznetsov (#3531)
-  - 39ae922a 2025-03-14T00:04:23+00:00 upgraded golang.org/x/oauth2 v0.25.0 => v0.28.0 (#3528)
-  - 75188674 2025-03-14T00:04:07+00:00 Revert "fix: update PSA versions to match Kubernetes API version (#3524)" (#3530)
-  - e192c069 2025-03-14T00:03:50+00:00 fix: update PSA versions to match Kubernetes API version (#3524)
-  - e5f3b5d3 2025-03-06T09:59:29-05:00 Update DOWNSTREAM owners files
-  - b6b4883d 2025-03-06T10:46:39+00:00 Ensure that PSA label is latest instead of pinning versions
-
-- kubernetes image-amd64 d6f2dd28529e5ecc8cdffaf443253f74382c2b60 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb
-  - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: <carry>: translate all existing rules to use filtering and the environemntSelector in the specs
-  - 40e44d8ef 2025-03-07T18:08:33+01:00 UPSTREAM: <carry>: Add volume group snapshot test driver
-
-- kubernetes image-arm64 f4a27c46e464f735615c60fc0b067471e7073e13 to 2ed17b46fa89c438d5983268bdc352ba8bd9b4bb
-  - d0c1b6d2c 2025-03-17T06:25:00-04:00 UPSTREAM: <carry>: translate all existing rules to use filtering and the environemntSelector in the specs
+- api embedded-component 8a7efbfb531684ef0ff566a882096df03e0f499c to 477760860ebdd921db389cf539439b0ec1064179
+  - 28ccba1d 2025-03-19T16:40:27-04:00 remove inactive reviewers and ex-Red Hatters from OWNERS, add everettraven
+  - 80f8dcff 2025-03-19T11:12:08+00:00 Remove patch tags from CRD conditions
+  - ea7057f8 2025-03-18T14:11:59+00:00 Update KAL to the latest version
+  - c86f460c 2025-03-11T10:46:36+01:00 add MaxAllowedBlockVolumesPerNode field to VSphereCSIDriverConfigSpec
+
+- cluster-network-operator embedded-component 510b7508ad7a66d1742c5d9f83a4143fa860029c to 1daca87a5c6ebd5e6d7b5bcc4374119b59061af6
+  - 11c08e6 2025-03-17T23:22:49+01:00 Check on ipsec.service instead of libreswan package on host
+  - cb99bc3 2025-03-17T20:02:27+01:00 Add version check for machine config operator
+  - 865ac69 2025-03-17T19:38:45+01:00 Mount top level directory for IPsec host paths
+  - 37693e9 2025-03-17T19:38:45+01:00 Move to use newer IPsec DaemonSets irrespective of MCP state
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -1,11 +1,11 @@
-https://github.com/openshift/api embedded-component 8a7efbfb531684ef0ff566a882096df03e0f499c
+https://github.com/openshift/api embedded-component 477760860ebdd921db389cf539439b0ec1064179
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component b1a1105065835fcd881529299bc431921f4aa156
 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172
 https://github.com/openshift/cluster-ingress-operator embedded-component 924279a66d42d633d658113846d68e8d3805ec26
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e41854880dcb1a9df3322c1494c93e9a9ac0babe
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 75f30cdb07d58ce71c0a247207a5d91799a48cc0
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4210c04aec1c7fde8f4c294421e090ebf9248285
-https://github.com/openshift/cluster-network-operator embedded-component 510b7508ad7a66d1742c5d9f83a4143fa860029c
+https://github.com/openshift/cluster-network-operator embedded-component 1daca87a5c6ebd5e6d7b5bcc4374119b59061af6
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a
 https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01
 https://github.com/openshift/csi-external-snapshotter embedded-component 1fc6ee158070b34f84a94489b33accb333714727

diff --git 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.19.0-0.nightly-2025-03-19-160541" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-19-200021"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-20-220245" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-20-200021"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-19-200021
		OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-20-200021
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.19.0-0.nightly-2025-03-19-160541
		OCP_VERSION := 4.19.0-0.nightly-2025-03-20-220245