diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index af798a87d4..f96a8cfc57 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-03-15-214557 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-03-22-143827 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index d1656f06e6..185932e17e 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-03-12-235119 +OCP_VERSION := 4.18.0-0.nightly-2026-03-22-143825 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 8f01f6e9d9..71735304f3 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:3b81f9d63097241aa29cf9fe69d88bf7ad6f842cfe9139d5cd254adf256917e6 + digest: sha256:b98aa5db9e7c90671e41a698e157dac875e540db8dba0f220536977fe0fbc0ac - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2aca8083cb9d1ab43fb45e0905545ded7834027e21b344e5fe476c581c3bcafe + digest: sha256:d6786a4168c4cc40f9d8b5f4b99e25f4a9c2f1e9abe78472451ba15b2bd0aa93 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index f53d038e8b..3c95b3fcd0 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:2cff1778d744677704c6859f63611340d12ddd3a3d1cd425b546061aadb4e7e9 + digest: sha256:6402acf81b8588988b08d30c9fe35eadd15c46ee343f12f2f7071fa5d693f5a3 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bb863f226d09a6aae0de5ea6bf64034643a18e802a54ddd3a44a89ffdb6865f5 + digest: sha256:3add1f66188850645d5fe187708dfb2b0bef84057f049b38ee4b731731d29d52 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 531bdbec6c..54f56ee798 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-03-15-214557" + "base": "4.18.0-0.nightly-arm64-2026-03-22-143827" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b81f9d63097241aa29cf9fe69d88bf7ad6f842cfe9139d5cd254adf256917e6", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aca8083cb9d1ab43fb45e0905545ded7834027e21b344e5fe476c581c3bcafe" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b98aa5db9e7c90671e41a698e157dac875e540db8dba0f220536977fe0fbc0ac", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6786a4168c4cc40f9d8b5f4b99e25f4a9c2f1e9abe78472451ba15b2bd0aa93" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index b55cf83787..341211dbad 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-03-12-235119" + "base": "4.18.0-0.nightly-2026-03-22-143825" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cff1778d744677704c6859f63611340d12ddd3a3d1cd425b546061aadb4e7e9", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb863f226d09a6aae0de5ea6bf64034643a18e802a54ddd3a44a89ffdb6865f5" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6402acf81b8588988b08d30c9fe35eadd15c46ee343f12f2f7071fa5d693f5a3", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3add1f66188850645d5fe187708dfb2b0bef84057f049b38ee4b731731d29d52" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 94fdd741e4..f1ba989fab 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:fe0eedb70254c83eda2b74ac52833ef36c87e18a7ad16cbe88bb22e59d5e0a65 + digest: sha256:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ea71e8998c3c3946e8352e604b828fc035c3a09cec8867f8a558d4191388264b + digest: sha256:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:979c8bd253e44964db7a260b2ef30c4f884341fd21f64c1cd77544c21f0e4706 + digest: sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26 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:ea71e8998c3c3946e8352e604b828fc035c3a09cec8867f8a558d4191388264b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965 - 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:fe0eedb70254c83eda2b74ac52833ef36c87e18a7ad16cbe88bb22e59d5e0a65 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377 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 878dfce4c7..845cbb3b05 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:afc92ef7dc56d26fae94b15ea364f139e4221528620c171ddd8755cf1a1d89f6 + digest: sha256:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1b60d44b4151cc97b03a634ab3ac9114552dbe3a0db013e75e388b30267bd159 + digest: sha256:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d12d0dc7eb86bbedf6b2d7689a28fd51f0d928f720e4a6783744304297c661ed + digest: sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a 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:1b60d44b4151cc97b03a634ab3ac9114552dbe3a0db013e75e388b30267bd159 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f - 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:afc92ef7dc56d26fae94b15ea364f139e4221528620c171ddd8755cf1a1d89f6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0 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 9cbd17c976..dd7babb6ce 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-03-15-214557" + "base": "4.18.0-0.nightly-arm64-2026-03-22-143827" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe0eedb70254c83eda2b74ac52833ef36c87e18a7ad16cbe88bb22e59d5e0a65", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea71e8998c3c3946e8352e604b828fc035c3a09cec8867f8a558d4191388264b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:979c8bd253e44964db7a260b2ef30c4f884341fd21f64c1cd77544c21f0e4706" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bea3943ddb284bf26bca4efbb14fdb64f8d4ea55cb05a0f90399b6bb9b7b1377", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dd2393e62640efd08bacb7eef62edcb003bb98690d15dc8a9282f7921d83965", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26" } } 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 869b867464..2de38858a2 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-03-12-235119" + "base": "4.18.0-0.nightly-2026-03-22-143825" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afc92ef7dc56d26fae94b15ea364f139e4221528620c171ddd8755cf1a1d89f6", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b60d44b4151cc97b03a634ab3ac9114552dbe3a0db013e75e388b30267bd159", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d12d0dc7eb86bbedf6b2d7689a28fd51f0d928f720e4a6783744304297c661ed" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2fb8cdddb30e4c35b60ce906dd58793e3be56d3c1975e6fa4333697f8300d0", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c930a5f01cfbfbb05fe5f10a68e8e14b9c54718ac30c7e76ad63d5f37d903b1f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b4e58e4714..e6ad25a6b5 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-03-15-214557" + "base": "4.18.0-0.nightly-arm64-2026-03-22-143827" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118e59ce337e04d4501da9c4a7d104302452e53de26df487a8d0f20f3306ca66", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d894190465fcba5581428f6dad258e62e205cedb7327fa3bc4e9cce07a846930", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e17c73852c3bf2bf31231ca943cd5b9a3945e64c260710e4386b74e658bc4688", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:979c8bd253e44964db7a260b2ef30c4f884341fd21f64c1cd77544c21f0e4706", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3076f6ad851ec022590776e86a86c5552388edf897d9a0d39d0ad2ec2cd0b75", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd443d3d348746143d646af2d0fd64ec6e3ddc9f1a7c56ea85d7eea192d57270", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:498fd176eace1159d119786bcccb81f154b77728ff4d59ddb7aa83bc8fea199e", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac86b99bf304fa267d6f05b80d4acd80d7a77005ae8cd2df6fef06be4e8f6819", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740aa2f7c29acafc1e92139a819d776e1f4d2925e7d833db3f5bcbdbb9668a26", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:526d28da9cbcee276e786431446798f3e099dd9c5e71a8a51967350b0c6a64e7", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93b6236ab89c220e20180de55319db390e9376dd30a39bfe5a4928ae45bfed26", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a5c1b72aa7e424ff4f977c0f0baecfe70c5bc80519eb2f4fd2e8f8ab85cf172", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54e2cf930d901f3c74ffd72912be931b7080f0065b1107e2971d28eb85f6e53c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a87edddac7856df68b6fb7fb6dac1314a8eaee2ef06724b4911312149a84ca2", "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:3fae29fb1ce0fc7bf4350180d18991315d3f0d5551f507cc578d9e5c04e9a036" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bf04f6138ca1a176c3d6773abb2e5046f10f2bb6bc88a12f25aca9ba3cc3842" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index bd6be8606f..1fa952574d 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-03-12-235119" + "base": "4.18.0-0.nightly-2026-03-22-143825" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6a4383333a1fd6d05c3f60ec793913f7937ee3d77f002d85e6c61e20507bf55", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c4d5a681595e428ff4b5083648c13615eed80be9084a3d3fc68a0295079cb12", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:002dfb86e17ad8f5cc232a7d2dce183b23335c8ecb7e7d31dcf3e4446b390777", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d12d0dc7eb86bbedf6b2d7689a28fd51f0d928f720e4a6783744304297c661ed", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a07ef759b16a97646b60765e9dd00ab90a75ea377779dffb2b1d6142d9ca8c33", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53d66d524ca3e787d8dbe30dbc4d9b8612c9cebd505ccb4375a8441814e85422", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:812819a9d712b9e345ef5f1404b242c281e2518ad724baebc393ec0fd3b3d263", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:153bdf80a3238006106e2454f046225eb44dfe3e23e3c07e3c6dc3d56f890da9", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abf970887e342b94876d6665eb04c8ceee910fb55c9397aab7e9fb89ed8fb897", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7eeed065eb6bd53bc56250371e4c5271b6cafb231ff1bbd13380e7c96b2aa79", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac3f0154ec888931b1010766e5932a5c911586ed3a985cd2d2738551468d822a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee0a227756da28d6fa7b0c02cda24167f8876698c39c5f273289266c19537365", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:459e79ed23926955a297fab111e57e390e1efb8998bf52832e4b85ef178d955d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d0659cadd6fc1e2de09f7dc11f8f9774e20d00eaa15bb7919154d1448c28fd3", "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:9609c00207cc4db97f0fd6162eb429d7f81654137f020a677e30cba26a887a24" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4651aeb57f73a4bfe983dc13bfa0010e688beca930de5290f58cb3b84da11851" } } diff --git a/go.mod b/go.mod index ae84a46494..4075fddb6a 100644 --- a/go.mod +++ b/go.mod @@ -218,7 +218,7 @@ replace ( github.com/openshift/route-controller-manager => ./deps/github.com/openshift/route-controller-manager // deps copy k8s.io/klog/v2 => ./deps/k8s.io/klog // deps clone github.com/kubernetes/klog from kubernetes k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes // deps copy - sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805135739-c0f1886ab08d // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator + sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260318155851-815b43b7f728 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator ) replace ( diff --git a/go.sum b/go.sum index 8e3a7ef625..8a76c089c3 100644 --- a/go.sum +++ b/go.sum @@ -361,8 +361,8 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250801133949-b5a4f8d079fb h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250801133949-b5a4f8d079fb/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= github.com/openshift/etcd/client/v3 v3.5.1-0.20250801133949-b5a4f8d079fb h1:D2mz3aZqDthYbz0VY5uLevaNPPk24DdrtA8ePYMwVDw= github.com/openshift/etcd/client/v3 v3.5.1-0.20250801133949-b5a4f8d079fb/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805135739-c0f1886ab08d h1:1UvAVKPosQFlnGieYK4araVZlEGMXJic/TIS+MaNd6k= -github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805135739-c0f1886ab08d/go.mod h1:Uj1Dk7oZKWRMPS8r6M3V7CUGTZxeD+bGTDwxCEGfPnY= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260318155851-815b43b7f728 h1:sT/TfSpSpVBWxzwa0AS5IoE+hT1LHfnyjLOh148Y45A= +github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260318155851-815b43b7f728/go.mod h1:Uj1Dk7oZKWRMPS8r6M3V7CUGTZxeD+bGTDwxCEGfPnY= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 0db0ed2b30..f0724e0816 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:53d66d524ca3e787d8dbe30dbc4d9b8612c9cebd505ccb4375a8441814e85422" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:459e79ed23926955a297fab111e57e390e1efb8998bf52832e4b85ef178d955d" 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 9ecfe8f05a..ec6f73a7d4 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:dd443d3d348746143d646af2d0fd64ec6e3ddc9f1a7c56ea85d7eea192d57270" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54e2cf930d901f3c74ffd72912be931b7080f0065b1107e2971d28eb85f6e53c" 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 4f438b416c..82625e94a4 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,18 +1,7 @@ -- machine-config-operator embedded-component 8e8d70cd2861f60af9597775a2de0f3297339ee1 to a72592f88e91c86ba00f14d5e104f9d3fbacb81a - - 88bf0661 2026-03-04T14:09:29+00:00 copy binaries directly into final stage - - a2725797 2026-03-04T14:09:29+00:00 clear dnf cache to reduce image size - - 832dd79b 2026-01-20T11:35:15+00:00 Add: enable nodeip-configuration for platform external +- kubernetes-kube-storage-version-migrator embedded-component c0f1886ab08d8c2ed84c9ea648b3f65cd82dc5f5 to 815b43b7f7288da76dd314553e113aefe2a5897d + - 524a88e 2026-02-24T16:46:06+01:00 UPSTREAM: : fix /vendor for hermetic 4.18 -- operator-framework-olm embedded-component c2df9e7c6ccac3489c833a03cfa3518d5eedf01f to 5cd473d377523ab5746804171dac03e4ae37993f - - d70e12ce 2026-03-04T00:41:24+00:00 Remove the collect-profiles info from the microshift kustomization file - -- ovn-kubernetes image-amd64 0a68692ea5e733e87eac8d6361c9cbb6a6258fb5 to 4634c88f75f42d4fd2c795d0b8153cbe5babe656 - - 1f2e97a8 2026-03-09T15:23:29+01:00 Add pperiyasamy to OWNERS for release-4.18 - - 1066c195 2026-03-01T00:20:26+05:30 Add a e2e test for NodePort service - - 5e6ce846 2026-03-01T00:19:19+05:30 Clear stale conntrack UDP entries for nodePorts - -- ovn-kubernetes image-arm64 0a68692ea5e733e87eac8d6361c9cbb6a6258fb5 to 4634c88f75f42d4fd2c795d0b8153cbe5babe656 - - 1f2e97a8 2026-03-09T15:23:29+01:00 Add pperiyasamy to OWNERS for release-4.18 - - 1066c195 2026-03-01T00:20:26+05:30 Add a e2e test for NodePort service - - 5e6ce846 2026-03-01T00:19:19+05:30 Clear stale conntrack UDP entries for nodePorts +- machine-config-operator embedded-component a72592f88e91c86ba00f14d5e104f9d3fbacb81a to ddf9a058799932c22942bdbef849178a6321c883 + - dd559ec9 2026-03-11T11:25:59-04:00 helpers: compute systemdUnits that added and changed between Ign configs update: only write added or updated systemd units unless forcefile exists then rewrite all systemd units on_disk_validation: check if systemd units in config enabled correctly tests: update MCN condition transition test to account for quick transitions through 'Unknown' state (cherry picked from commit 4512ec46f7b13a6e85588bbf480c4d029990724a) + - 858deafe 2025-10-03T07:06:05+00:00 OCPBUGS-60805: configure-ovs: work around a Cisco switch issue diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index bef0cb400a..163e394053 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -11,8 +11,8 @@ https://github.com/openshift/cluster-policy-controller embedded-component 5fd852 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3 https://github.com/openshift/kubernetes embedded-component 91c24081f468e7636c824f4f5a2eb68660b81012 -https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component c0f1886ab08d8c2ed84c9ea648b3f65cd82dc5f5 -https://github.com/openshift/machine-config-operator embedded-component a72592f88e91c86ba00f14d5e104f9d3fbacb81a +https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 815b43b7f7288da76dd314553e113aefe2a5897d +https://github.com/openshift/machine-config-operator embedded-component ddf9a058799932c22942bdbef849178a6321c883 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 https://github.com/openshift/operator-framework-olm embedded-component 5cd473d377523ab5746804171dac03e4ae37993f https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 0cc1c5f6b4..8fab158e5a 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-03-12-235119" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-15-214557" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-03-22-143825" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-03-22-143827" diff --git a/vendor/modules.txt b/vendor/modules.txt index eb1ae37c6a..2fd12865fe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -3052,7 +3052,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client ## explicit; go 1.18 sigs.k8s.io/json sigs.k8s.io/json/internal/golang/encoding/json -# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805135739-c0f1886ab08d +# sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260318155851-815b43b7f728 ## explicit; go 1.22.0 sigs.k8s.io/kube-storage-version-migrator/pkg/apis/migration/v1alpha1 sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset @@ -3162,7 +3162,7 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/route-controller-manager => ./deps/github.com/openshift/route-controller-manager # k8s.io/klog/v2 => ./deps/k8s.io/klog # k8s.io/kubernetes => ./deps/github.com/openshift/kubernetes -# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250805135739-c0f1886ab08d +# sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260318155851-815b43b7f728 # k8s.io/api => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/api # k8s.io/apiextensions-apiserver => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver # k8s.io/apimachinery => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery