diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 75db8c6884..0be07881f0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-15-191820 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-22-234627 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index dd07396778..2ea7edfebd 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-04-15-212456 +OCP_VERSION := 4.18.0-0.nightly-2026-04-22-054626 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 6c1f1e686b..adf8ee91a2 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:5d6f5f78183b99d962955687ce1163ed78f8bf768bdd886081f330b5071f50fa + digest: sha256:01a8acf25bd2757dadbf29ba1314a05e88d82443c5ec33eba2288de28b3bd42c - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4489ebdb5380905e5f80c4b341bb4e0cabe1f6768406416c6b21c07cb54b7649 + digest: sha256:576e8bf00a9d9e1edd0337d9a9392fceaf7563b83de64c573e439b6598e0497a diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 488bdf92f1..e65c9db8d0 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:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80 + digest: sha256:df7cce5bc4057b0ed80b597949831efa76c2c6cef7c33fd2564410fda28468eb - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab + digest: sha256:a007233602356cba48a9da74a94fba4a1394c21f6510efc838ab54658f762ba2 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 49d00b2198..40dbeb5b57 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-15-191820" + "base": "4.18.0-0.nightly-arm64-2026-04-22-234627" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6f5f78183b99d962955687ce1163ed78f8bf768bdd886081f330b5071f50fa", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4489ebdb5380905e5f80c4b341bb4e0cabe1f6768406416c6b21c07cb54b7649" + "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" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index a9e605fc7d..333614f235 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-15-212456" + "base": "4.18.0-0.nightly-2026-04-22-054626" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab" + "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" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index d97b932a3c..d391ac3786 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:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c + digest: sha256:ebb816d7fc3f40241880dc15f4edb576a610137864b230243e9f3dea625d851c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c + digest: sha256:12428d54a4e0f6f4c251d2f5803426e602fb3cffab48bbd8ba5bb82c13ea02ff - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81 + digest: sha256:e8524c04c446688f3f226e4cdc2905e7b4fdf98b3d063b36c6c8460681923efc 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:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12428d54a4e0f6f4c251d2f5803426e602fb3cffab48bbd8ba5bb82c13ea02ff - 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:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebb816d7fc3f40241880dc15f4edb576a610137864b230243e9f3dea625d851c 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 071cc1474c..08cfb4c6d8 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:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a + digest: sha256:d32ec90e09f1bc32def173de20b7eca10ebc62d296f86df9f8e09b9dced86f08 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08 + digest: sha256:ecfdfa74f6fe7bd61b498e628d9c4bb21e689c403b41d7b83ddee645203294a0 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba + digest: sha256:340158a51815707a848f58a25427e720f77fdcb8e2bdac5222f285a77ac9c871 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:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecfdfa74f6fe7bd61b498e628d9c4bb21e689c403b41d7b83ddee645203294a0 - 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:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d32ec90e09f1bc32def173de20b7eca10ebc62d296f86df9f8e09b9dced86f08 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 3e48692a6c..b8ec0a1e42 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-15-191820" + "base": "4.18.0-0.nightly-arm64-2026-04-22-234627" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81" + "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" } } 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 992c61f10b..93a98b10a9 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-15-212456" + "base": "4.18.0-0.nightly-2026-04-22-054626" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba" + "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" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f275920e0a..99e79d9560 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-15-191820" + "base": "4.18.0-0.nightly-arm64-2026-04-22-234627" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb5c9be5b0327170ecff8b5908b09e2e662a4e90503508c42005ff81071ec458", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b767dfffa4a615f8b42e7773072186491f465291954849f61584ddb732ee960a", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:819b1f6057a63e26728e33c1eaa93fb3343e1e3da364975fc647aadf18083104", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d883c2f2c69455424e1d8b2f809acfd31ca5bb3c5a28bbe251e54a36c50860df", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aa4cb7dfb9055c72abaf0d3bb49ead44c261205349008d0b3f58bd84dc1cb7c", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17a9576b70345f42877cbde93152028684a9896ce0b6ad73aaf1dbbbe997e22e", + "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", "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:8a6ef6b425873f488c70ce9d6326f5836f6ec03790cd700205c0a51d670bd79c" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b875accd43af3d23e443e40a42760c0c8935599fcd3d00e6cba45cd9d077a64d" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 4070fa0489..08c3db2912 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-15-212456" + "base": "4.18.0-0.nightly-2026-04-22-054626" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8be4cac4970e1a10f8c09f687c58f06da94490d7066f396cf99abb1ca17631b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aec9d41fa28a58c06da3a546a1c769f510cc61aa27075801810df9704045073", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591ea2bdd4da524be713012cc018beb9d8a42c7849cdcb96bedea4b4d6fb6d3d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3244aacf3692d15925086ba6b8a8a3b2812050eea224e8f14b67649fdb7ad41d", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0484b5a37e8452c4196416140eae98fea34b1678bfc08b58189e797c480c649f", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73cece342ba4eeddf58cd68c5406d14af3a2aa853b8568cf2e7ce37e4df4046c", + "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", "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:b70d5b3ea83133aaa3b0ac9e03cb89061cc19ac7e5ebaa13bcf1bb67efff589e" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78cf1083d60b4216a512d70e22d76308206845b6866c6caf49abf9567dabeab9" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index acf8fc93db..196e1f78af 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:0484b5a37e8452c4196416140eae98fea34b1678bfc08b58189e797c480c649f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44b90e1c867a98b8dfa4f966b92080aff1698f282ac86e2ca47ce197513ca2cd" 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 0500acbc95..2f069f619e 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:2aa4cb7dfb9055c72abaf0d3bb49ead44c261205349008d0b3f58bd84dc1cb7c" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bbe4597e5fd747a8845f4a1119a70afd51ec0c4236c4f5c888f65e4f9287973" 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 e69de29bb2..10ad2bda7a 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,46 @@ +- 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` + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index c9d8e11df4..ce912aadd0 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -17,19 +17,19 @@ https://github.com/openshift/openshift-controller-manager embedded-component 8ee https://github.com/openshift/operator-framework-olm embedded-component 4680ec1ee00e1af34e29ec598ac983bf74d2e523 https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539 -https://github.com/openshift/oc image-amd64 3a48fc2998a051a77a97cc3393b5d189c22635e0 +https://github.com/openshift/oc image-amd64 6febe61977471b066f08d513424b226b82ee518f https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e2620d7036d4 https://github.com/openshift/csi-external-snapshotter image-amd64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/router image-amd64 ccd9551702a89cac27e38ebb63801ddb6823d101 https://github.com/openshift/kube-rbac-proxy image-amd64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 -https://github.com/openshift/ovn-kubernetes image-amd64 4634c88f75f42d4fd2c795d0b8153cbe5babe656 +https://github.com/openshift/ovn-kubernetes image-amd64 6fe7a1f403388a7540aea240e8203c28b40728af https://github.com/openshift/kubernetes image-amd64 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539 -https://github.com/openshift/oc image-arm64 3a48fc2998a051a77a97cc3393b5d189c22635e0 +https://github.com/openshift/oc image-arm64 6febe61977471b066f08d513424b226b82ee518f https://github.com/openshift/coredns image-arm64 8ca7f02b8becb40f7a9919243000e2620d7036d4 https://github.com/openshift/csi-external-snapshotter image-arm64 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/router image-arm64 ccd9551702a89cac27e38ebb63801ddb6823d101 https://github.com/openshift/kube-rbac-proxy image-arm64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 -https://github.com/openshift/ovn-kubernetes image-arm64 4634c88f75f42d4fd2c795d0b8153cbe5babe656 +https://github.com/openshift/ovn-kubernetes image-arm64 6fe7a1f403388a7540aea240e8203c28b40728af https://github.com/openshift/kubernetes image-arm64 91c24081f468e7636c824f4f5a2eb68660b81012 https://github.com/openshift/service-ca-operator image-arm64 30efb529a5b7db5d6f352f6ac0470d8385268539 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 5b1f2ca830..93a1d42874 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-15-212456" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-04-15-191820" +./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"