diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0be07881f0..5efd712d16 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-22-234627 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-26-054627 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 2ea7edfebd..128d5aa117 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-04-22-054626 +OCP_VERSION := 4.18.0-0.nightly-2026-04-26-014932 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index adf8ee91a2..2abd4476c0 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/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:01a8acf25bd2757dadbf29ba1314a05e88d82443c5ec33eba2288de28b3bd42c + digest: sha256:5239f41c7575c285e1f64ed9effcdd1933978aa8b490d172d634490a5aed366f - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:576e8bf00a9d9e1edd0337d9a9392fceaf7563b83de64c573e439b6598e0497a + digest: sha256:e8d44af7cf9a6537825ed45d5728a3f78d38c7cc2225cd859f3063e5a644c8f1 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index e65c9db8d0..7d88c150b6 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/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:df7cce5bc4057b0ed80b597949831efa76c2c6cef7c33fd2564410fda28468eb + digest: sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a007233602356cba48a9da74a94fba4a1394c21f6510efc838ab54658f762ba2 + digest: sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 40dbeb5b57..7fa2c68735 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-04-22-234627" + "base": "4.18.0-0.nightly-arm64-2026-04-26-054627" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01a8acf25bd2757dadbf29ba1314a05e88d82443c5ec33eba2288de28b3bd42c", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:576e8bf00a9d9e1edd0337d9a9392fceaf7563b83de64c573e439b6598e0497a" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5239f41c7575c285e1f64ed9effcdd1933978aa8b490d172d634490a5aed366f", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8d44af7cf9a6537825ed45d5728a3f78d38c7cc2225cd859f3063e5a644c8f1" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 333614f235..ff343c5554 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-2026-04-22-054626" + "base": "4.18.0-0.nightly-2026-04-26-014932" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df7cce5bc4057b0ed80b597949831efa76c2c6cef7c33fd2564410fda28468eb", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a007233602356cba48a9da74a94fba4a1394c21f6510efc838ab54658f762ba2" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b894da705e0ba383443504701b4110ecdf5098581601f7393f60446c0fedf2b", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ebd22fb19b406a24444d4427575931fdbdd620c272adbe7fb074d61180424a9" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index d391ac3786..0a3e86d6b9 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:ebb816d7fc3f40241880dc15f4edb576a610137864b230243e9f3dea625d851c + digest: sha256:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:12428d54a4e0f6f4c251d2f5803426e602fb3cffab48bbd8ba5bb82c13ea02ff + digest: sha256:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e8524c04c446688f3f226e4cdc2905e7b4fdf98b3d063b36c6c8460681923efc + digest: sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec 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:12428d54a4e0f6f4c251d2f5803426e602fb3cffab48bbd8ba5bb82c13ea02ff + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46 - 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:ebb816d7fc3f40241880dc15f4edb576a610137864b230243e9f3dea625d851c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d 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 08cfb4c6d8..71536f8b19 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:d32ec90e09f1bc32def173de20b7eca10ebc62d296f86df9f8e09b9dced86f08 + digest: sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ecfdfa74f6fe7bd61b498e628d9c4bb21e689c403b41d7b83ddee645203294a0 + digest: sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:340158a51815707a848f58a25427e720f77fdcb8e2bdac5222f285a77ac9c871 + digest: sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf 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:ecfdfa74f6fe7bd61b498e628d9c4bb21e689c403b41d7b83ddee645203294a0 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa - 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:d32ec90e09f1bc32def173de20b7eca10ebc62d296f86df9f8e09b9dced86f08 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3 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 b8ec0a1e42..9b5725535d 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.18.0-0.nightly-arm64-2026-04-22-234627" + "base": "4.18.0-0.nightly-arm64-2026-04-26-054627" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebb816d7fc3f40241880dc15f4edb576a610137864b230243e9f3dea625d851c", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12428d54a4e0f6f4c251d2f5803426e602fb3cffab48bbd8ba5bb82c13ea02ff", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8524c04c446688f3f226e4cdc2905e7b4fdf98b3d063b36c6c8460681923efc" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc143030e7105e1dbc7f2eba5106d6c8e0a54e40b1382a34b1983df48291109d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e6310d99f1fa576292e46c1173ece1a01e3d506aa7748463d37f682c2cfec46", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec" } } 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 93a98b10a9..f087c562a3 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.18.0-0.nightly-2026-04-22-054626" + "base": "4.18.0-0.nightly-2026-04-26-014932" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d32ec90e09f1bc32def173de20b7eca10ebc62d296f86df9f8e09b9dced86f08", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecfdfa74f6fe7bd61b498e628d9c4bb21e689c403b41d7b83ddee645203294a0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:340158a51815707a848f58a25427e720f77fdcb8e2bdac5222f285a77ac9c871" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66f6a9bbdd24e7f6d1653cfdbcad28cc243793002308e1113095fbd1dc9f33b3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c6bbba6992696aef1231e34a3652b244bca77d4d8d368d57cbc052ef16bfcaa", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 99e79d9560..97995a0a58 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2026-04-22-234627" + "base": "4.18.0-0.nightly-arm64-2026-04-26-054627" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22834e6a4ddfab71e61eb933acde7748752b7c8ced8f0cc4aaac0f4cd1a62db4", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5d08c49b9f19070ccd9942debfea90983e651d49ed793cb50c3ee318ae48acd", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e09e9ace8b2ec783ae5f96dabaa975bac1e77cd96bfb88c9d58b28c05c174d0c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8524c04c446688f3f226e4cdc2905e7b4fdf98b3d063b36c6c8460681923efc", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:814a7e8f001d1dd35dc100e0dc5e978af9d1253f579ef3f145ea9ebc7d7739c6", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bbe4597e5fd747a8845f4a1119a70afd51ec0c4236c4f5c888f65e4f9287973", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8408c3590025b5029b8b5d36b4e0db56fc24fac59266f7f5dce1f36efc7d623f", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1836005d98266af037e2bc0eddb2a65628d8ecaa87b1d671b848b0c1a5bc40c", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c1eef746b903f9413d67b626882fb617b20925abc65012c0f065de1cdf954f8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9555f021b3a67ed9bbab4d790576efdf6b6b0ade72c82762fb17e94c60899b2d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7989695c15f10088861b70e2f6f31bfb5954d882de137e88d964aac9b1e9bec", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c95bbed73b91abcfb8d5195fa60efbc7ddbc6f37ab0db5e3c0700ffc8a4df4b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18460fd76ca550a5c6f09e213ae7b319598e792bb4b1374a0352c102d3cd429f", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaac216542e65fbd518ccecb4f19011fd0d9ac15839f195f5b0207589b1cf661", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b875accd43af3d23e443e40a42760c0c8935599fcd3d00e6cba45cd9d077a64d" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:838f2f44d2cffb8784d6975e2c8048a6f22b045b19f65cb1932bd204acacf20d" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 08c3db2912..b3d301f5b5 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-2026-04-22-054626" + "base": "4.18.0-0.nightly-2026-04-26-014932" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b50ff063adcf5c109c0160a59c78dca23b58aabfe01e9e5eff50c93e635a453", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f25044c89bbf3abe18ffaf177b29c547dc1ea04270f0fb44d83b34551f551290", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33a8215c4bc1fbeffcdc8e49f18c6a86349c41c7b8e9349e4e4750a50593b890", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:340158a51815707a848f58a25427e720f77fdcb8e2bdac5222f285a77ac9c871", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ab54d6584143cad36c6725cb9634309c6326623a0910390ec7dae40c8db4d34", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44b90e1c867a98b8dfa4f966b92080aff1698f282ac86e2ca47ce197513ca2cd", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cf27c473a18081cc9e02e27da6c8a74094285c3e6b26ebe9f41290421d5a154", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fae8d6f288aa9b4dc6812d572c1d2acc6cd4d85b17bf9d73fb723b2104f8708f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc59b3d720c2e8240087d7bae474b618ad810d163afd2072bb9c95cf83dd71cc", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2804591b8bc70f5d4c8f94d722de4fb9d01de1bcf329c05b4a31577b6741bd4d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:236b716621a88efd57cdf6f704340fb2faf4583651ecbda524261e0b5a9b39cf", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:886f10bd5e85c2508ec4f51be620d06852367387749578c77e68d8eb979948f8", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:187f9b0a3870f29230341708af35ab9befe217fb7d5c9c0aa663a365175b3f83", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78cf1083d60b4216a512d70e22d76308206845b6866c6caf49abf9567dabeab9" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8657b9eca6df33d652c05c4ca594236aa42277ed5d83b7757748be262f2ffd1f" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 196e1f78af..5ceb87bd74 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # 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:44b90e1c867a98b8dfa4f966b92080aff1698f282ac86e2ca47ce197513ca2cd" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebcd6745e15ac3776016a78fc9882f5ca05f5f6afbb5edd97edd70377f667d1" 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 2f069f619e..8ab9badc54 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # 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:0bbe4597e5fd747a8845f4a1119a70afd51ec0c4236c4f5c888f65e4f9287973" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18460fd76ca550a5c6f09e213ae7b319598e792bb4b1374a0352c102d3cd429f" 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 10ad2bda7a..792e7d08c8 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,46 +1,4 @@ -- oc image-amd64 3a48fc2998a051a77a97cc3393b5d189c22635e0 to 6febe61977471b066f08d513424b226b82ee518f - - 42c8136f 2025-12-19T04:24:37+00:00 pkg/cli/admin/upgrade: Tighten force warnings - -- ovn-kubernetes image-amd64 4634c88f75f42d4fd2c795d0b8153cbe5babe656 to 6fe7a1f403388a7540aea240e8203c28b40728af - - f5bc6581 2026-03-31T16:50:55+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison - - 021457f5 2026-03-01T00:16:09+05:30 Add a e2e test for NodePort service - - e0a33894 2026-02-27T20:06:49+05:30 Clear stale conntrack UDP entries for nodePorts - - 28f5871b 2026-02-26T18:28:53+01:00 nodeallocator: fix subnet leak when hybrid overlay is enabled - - 26f25084 2026-02-26T18:27:26+01:00 nodeallocator: fix subnet leak when hybrid overlay is enabled - - d1bc30cb 2026-02-24T11:50:36+01:00 Fix IC cluster cleanup tests zone configuration - - ab1f5789 2026-02-24T11:50:36+01:00 Remove IC zone migration HACK code - - c8ada1f6 2026-02-24T11:35:02+01:00 Fix IC cluster cleanup tests zone configuration - - e61ba4ba 2026-02-24T11:35:02+01:00 Remove IC zone migration HACK code - - b1669576 2026-01-21T14:00:27+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync - - 3e2e21c5 2026-01-14T09:09:40+01:00 Replace 0/1 index var to utilnet ipFamily - - 484a18f3 2026-01-14T09:09:35+01:00 Skip Multi Homing tests on ipv6 singlestack BGP lane - - a4ef8dce 2026-01-14T09:09:31+01:00 Fix bgp tests to work on single stack ipv6 - - 42359641 2026-01-14T09:09:25+01:00 Add singlestack ipv6 bgp lane - - 925ae3bc 2026-01-14T09:09:21+01:00 Add e2e test towards kapi ipv6 address from udn pods - - 83fa5f7d 2026-01-14T09:07:51+01:00 Make ip and ipv6 constants in flow code - - 983ea56a 2026-01-14T09:04:25+01:00 Consider more than 1 family serviceCIDR range for UDN service flows - - 2e5be2d4 2026-01-14T08:52:13+01:00 Fix UDN service CIDR flows that had protocol prefix pinned to `ip` - -- oc image-arm64 3a48fc2998a051a77a97cc3393b5d189c22635e0 to 6febe61977471b066f08d513424b226b82ee518f - - 42c8136f 2025-12-19T04:24:37+00:00 pkg/cli/admin/upgrade: Tighten force warnings - -- ovn-kubernetes image-arm64 4634c88f75f42d4fd2c795d0b8153cbe5babe656 to 6fe7a1f403388a7540aea240e8203c28b40728af - - f5bc6581 2026-03-31T16:50:55+08:00 node: fix serviceUpdateNotNeeded nil pointer comparison - - 021457f5 2026-03-01T00:16:09+05:30 Add a e2e test for NodePort service - - e0a33894 2026-02-27T20:06:49+05:30 Clear stale conntrack UDP entries for nodePorts - - 28f5871b 2026-02-26T18:28:53+01:00 nodeallocator: fix subnet leak when hybrid overlay is enabled - - 26f25084 2026-02-26T18:27:26+01:00 nodeallocator: fix subnet leak when hybrid overlay is enabled - - d1bc30cb 2026-02-24T11:50:36+01:00 Fix IC cluster cleanup tests zone configuration - - ab1f5789 2026-02-24T11:50:36+01:00 Remove IC zone migration HACK code - - c8ada1f6 2026-02-24T11:35:02+01:00 Fix IC cluster cleanup tests zone configuration - - e61ba4ba 2026-02-24T11:35:02+01:00 Remove IC zone migration HACK code - - b1669576 2026-01-21T14:00:27+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync - - 3e2e21c5 2026-01-14T09:09:40+01:00 Replace 0/1 index var to utilnet ipFamily - - 484a18f3 2026-01-14T09:09:35+01:00 Skip Multi Homing tests on ipv6 singlestack BGP lane - - a4ef8dce 2026-01-14T09:09:31+01:00 Fix bgp tests to work on single stack ipv6 - - 42359641 2026-01-14T09:09:25+01:00 Add singlestack ipv6 bgp lane - - 925ae3bc 2026-01-14T09:09:21+01:00 Add e2e test towards kapi ipv6 address from udn pods - - 83fa5f7d 2026-01-14T09:07:51+01:00 Make ip and ipv6 constants in flow code - - 983ea56a 2026-01-14T09:04:25+01:00 Consider more than 1 family serviceCIDR range for UDN service flows - - 2e5be2d4 2026-01-14T08:52:13+01:00 Fix UDN service CIDR flows that had protocol prefix pinned to `ip` +- cluster-network-operator embedded-component c7c587b0d7cc0e9b344291bed5e66dc59e15c74e to 99c785cb3e5577067ff785ebad6344dc9b9bbc18 + - 7da176f 2026-04-21T17:04:38+05:30 Add config override for openflow-probe + - 696e51c 2026-04-21T16:57:29+05:30 Allow overriding OVN-Kubernetes configuration diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ce912aadd0..104266d724 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6347fc8179b2a04d51c99432ae612bf4df595dc0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4e99db62cea1d2ca48765230c6f5663d1f2c2702 -https://github.com/openshift/cluster-network-operator embedded-component c7c587b0d7cc0e9b344291bed5e66dc59e15c74e +https://github.com/openshift/cluster-network-operator embedded-component 99c785cb3e5577067ff785ebad6344dc9b9bbc18 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 93a1d42874..ff65d7604c 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.18.0-0.nightly-2026-04-22-054626" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-22-234627" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-04-26-014932" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-26-054627"