diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e369b9f742..6f09e88af3 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-02-213117 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-06-224445 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 6f87f834f1..16022d91eb 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-04-01-223038 +OCP_VERSION := 4.22.0-0.nightly-2026-04-06-051707 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 6036fc726b..74eb6551f7 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/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:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2 + digest: sha256:a8594564464eab721ee7be1e3ad9782f64db1919e05ecd9efb04b9b02b319ccd - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d + digest: sha256:4a4d262285a470ade4b9f3f8d298b8e4148faf04bafe343446ef8b4fcf2215eb diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 8d63c55a14..3b47a68530 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:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe + digest: sha256:7ac8c9d69741b785cb789035d22b87a4be7751f97795653ed5a4dc06461fef9e - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74 + digest: sha256:6f51665ef5de8db99fddcaa42f3e7aad559aec9d231acd962f7f97122eb7f441 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 71c61fca97..a6fcdf0704 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-04-02-213117" + "base": "4.22.0-0.nightly-arm64-2026-04-06-224445" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8594564464eab721ee7be1e3ad9782f64db1919e05ecd9efb04b9b02b319ccd", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a4d262285a470ade4b9f3f8d298b8e4148faf04bafe343446ef8b4fcf2215eb" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 484c2c44d5..275f7ab78c 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.22.0-0.nightly-2026-04-01-223038" + "base": "4.22.0-0.nightly-2026-04-06-051707" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ac8c9d69741b785cb789035d22b87a4be7751f97795653ed5a4dc06461fef9e", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f51665ef5de8db99fddcaa42f3e7aad559aec9d231acd962f7f97122eb7f441" } } diff --git a/assets/components/service-ca/clusterrole.yaml b/assets/components/service-ca/clusterrole.yaml index 4ef03dc5cf..133251f6a2 100644 --- a/assets/components/service-ca/clusterrole.yaml +++ b/assets/components/service-ca/clusterrole.yaml @@ -78,3 +78,11 @@ rules: - get - list - watch +- apiGroups: + - config.openshift.io + resources: + - featuregates + verbs: + - get + - list + - watch diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 20bf82baa4..3751a3b63c 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:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402 + digest: sha256:ae9a0f5825c9efb049be025a15f617e2cea5f8f8128325d367adf687abad9c38 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975 + digest: sha256:cf0c29a794e8327b1872056cf33f34e468c89d1c43f771a8b54627fd14cd7522 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788 + digest: sha256:d9324204851556e827e74a8567e7e04f7640951a537c1e1ee263c7f0024d75df 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:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf0c29a794e8327b1872056cf33f34e468c89d1c43f771a8b54627fd14cd7522 - 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:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae9a0f5825c9efb049be025a15f617e2cea5f8f8128325d367adf687abad9c38 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 608e46929e..4939aa229e 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:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2 + digest: sha256:6aa1cf5e4961bbd58acee4044d24007dbe60952d3f7c2fdc2c50df7aa799040a - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8 + digest: sha256:2945dc0a21f9f9fe088049b07e1e3f0906c6faee4dda94d4ca79a41a7b77b278 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743 + digest: sha256:b88f816a55928c2ae2d0986093a1b0b6e5b80fdc1311516560b82b19e8218388 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:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2945dc0a21f9f9fe088049b07e1e3f0906c6faee4dda94d4ca79a41a7b77b278 - 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:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aa1cf5e4961bbd58acee4044d24007dbe60952d3f7c2fdc2c50df7aa799040a 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 1a5194a163..2d3d9e28ce 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.22.0-0.nightly-arm64-2026-04-02-213117" + "base": "4.22.0-0.nightly-arm64-2026-04-06-224445" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae9a0f5825c9efb049be025a15f617e2cea5f8f8128325d367adf687abad9c38", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf0c29a794e8327b1872056cf33f34e468c89d1c43f771a8b54627fd14cd7522", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9324204851556e827e74a8567e7e04f7640951a537c1e1ee263c7f0024d75df" } } 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 15f759a1dc..1ffb4975fb 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.22.0-0.nightly-2026-04-01-223038" + "base": "4.22.0-0.nightly-2026-04-06-051707" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6aa1cf5e4961bbd58acee4044d24007dbe60952d3f7c2fdc2c50df7aa799040a", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2945dc0a21f9f9fe088049b07e1e3f0906c6faee4dda94d4ca79a41a7b77b278", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b88f816a55928c2ae2d0986093a1b0b6e5b80fdc1311516560b82b19e8218388" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 596e4cd30e..0d38e97c1d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-04-02-213117" + "base": "4.22.0-0.nightly-arm64-2026-04-06-224445" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:835082ac6f84153d7db69efe76862e92c29fd251803be928209e98f187c1bc8d", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7abb8320c380cfc7d75599f01e96907d1b9562a1be4a5e800c25b62de24eff62", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdb988f8075078798dc00de52f75d4b9c7aa9d80ffdd202fd7476a5de7430c91", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef9cad701c4c04fc7677bce9bdae0f39609f5c3578feb97c95c4ea0d5d9b8573", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6da80cc031eeaf2e1895cde616e1fa7bb86007bd5a114e619b0a0eee361268a1", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:066a8b6dd1019c6c096ae71496334088218bbab0673b9801281172a613503dac", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74e127c2857234a01eead731e7a7db1bddf40fb60ce49de4ab3375e12ef158ca", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9324204851556e827e74a8567e7e04f7640951a537c1e1ee263c7f0024d75df", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:541768bb1d94059e9ae5104bc44347041a0e01bbbc4c30fd76ff8101c6dde429", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2116627fc4f10caf78e8db3382f1dd5d178cce34568aabba67a73a741ef3820c", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:433aa7050a25cf8eacbca42a490c715334f42ddb8c894036dfb3bed430a3a92e", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc954461f464bb9a26fbfa41aa3f9275d382fe0e529185827b829f5e1b075eb5" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fb01f70e94d64c7845d5331f1865e6657124618cd7031c4fb8d4cf7d9809916" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index b1696f4930..25915b08f8 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-2026-04-01-223038" + "base": "4.22.0-0.nightly-2026-04-06-051707" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f7a852610d92a3c751cc9a1d095349498027ab01199d177bf798b116fd1d8b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7386c18b14ce499057b6cf9494d48ec02fe0f13474767306ff78f443c90d1450", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56078e74606f8111c021a599acae8779c787a6803bebba40b3b8c36b5a5469a6", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a57fe2d1c81778088dacc9992dc54a5c37df54904384a83285a23b1a4c654a5", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e33f10b68b3d6e40f059734d7943d995c792c79d2ca64d31f3d15f7e9d8ce807", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fcebe23dec478754c6d867eea754a7319d7f6919ee95cea8f47561ac6ecbf24", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aac9e965ef7fdd50d0e3b88c8ac27e8002c2178c6a99a3b8a5401f27f71e65b2", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20c9c40ecdbe27007c30502cd99a231c7e4091df1cf3783066b2387fef89eb8d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e50f389d95d7d8c98bcacafeff8d3698cdc53aa8fdc5dc641508535ea81f48bb", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b88f816a55928c2ae2d0986093a1b0b6e5b80fdc1311516560b82b19e8218388", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:097a7a2743a77bcfa7a9d292167c8706a9562476b8f9f41bdd230d3798d6dcd1", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3416792e303bd71939b9c8ef9ddc49578df5cb952d5220a64cc7fc0dd46f5098", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcb04f6748b5e0f94b53b83cadf6d01323d17f378d15d9ad692e2375f0cc9a44", "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:fbb958e9953a5af8bc2a8b93e5351559df3b22663e5578bcaae69d5863020cc8" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d10afa7ab0d1348dbb08ac956851687c873457e009d6d76d1b4650b2afb1259" } } diff --git a/etcd/go.mod b/etcd/go.mod index 04d82f8b40..5964a7b5f5 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -5,7 +5,7 @@ go 1.25.0 replace github.com/openshift/microshift => ../ require ( - github.com/openshift/api v0.0.0-20260402091533-d0af9d722390 + github.com/openshift/api v0.0.0-20260406193844-f50e695cb194 github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af github.com/openshift/microshift v0.0.0-00010101000000-000000000000 github.com/spf13/cobra v1.10.2 diff --git a/etcd/go.sum b/etcd/go.sum index 7ea290207d..08ae1815ee 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -152,8 +152,8 @@ github.com/oklog/run v1.2.0 h1:O8x3yXwah4A73hJdlrwo/2X6J62gE5qTMusH0dvz60E= github.com/oklog/run v1.2.0/go.mod h1:mgDbKRSwPhJfesJ4PntqFUbKQRZ50NgmZTSPlFA0YFk= github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= -github.com/openshift/api v0.0.0-20260402091533-d0af9d722390 h1:tzmI6HyEB/2gQu3NEo/qzFsy2IMyuYaSy64Sg8vv5UI= -github.com/openshift/api v0.0.0-20260402091533-d0af9d722390/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo= +github.com/openshift/api v0.0.0-20260406193844-f50e695cb194 h1:jB/0er5MIFJ6FtQPCvA+9JP7UFnoS8H6hpxEnKEgiBQ= +github.com/openshift/api v0.0.0-20260406193844-f50e695cb194/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af h1:UiYYMi/CCV+kwWrXuXfuUSOY2yNXOpWpNVgHc6aLQlE= github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849 h1:em2blvFukNrVPlEZuMA1rHioi0eFjSk5qvV/Yp02HxQ= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index d30f71fd9b..d79fad046f 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -197,7 +197,7 @@ github.com/munnerz/goautoneg # github.com/oklog/run v1.2.0 ## explicit; go 1.20 github.com/oklog/run -# github.com/openshift/api v0.0.0-20260402091533-d0af9d722390 +# github.com/openshift/api v0.0.0-20260406193844-f50e695cb194 ## explicit; go 1.25.0 github.com/openshift/api/config/v1 github.com/openshift/api/operator/v1 diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 5f56db49ae..333ad7a0ed 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -2,6 +2,6 @@ # 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:e33f10b68b3d6e40f059734d7943d995c792c79d2ca64d31f3d15f7e9d8ce807" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3416792e303bd71939b9c8ef9ddc49578df5cb952d5220a64cc7fc0dd46f5098" 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 39826fb65b..9b87eb3425 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # 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:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2116627fc4f10caf78e8db3382f1dd5d178cce34568aabba67a73a741ef3820c" 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 0e06f91661..7105882086 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,18 +1,35 @@ -- api embedded-component 80fcf457ee87d9a81075bcc4e6deac506448195f to e9d6d439b48bfa2d127ee90c28e6d0f55243b620 - - ceacb94c 2026-03-24T09:40:44+05:30 kubebuilder validation and clarified API behavior for KubeletConfig API doc and adds tests - - 13eaa95e 2026-03-02T18:23:59+05:30 kubebuilder validation and clarified API behavior for KubeletConfig API doc and adds tests - -- cluster-ingress-operator embedded-component dfec6c028e2d4eaf7dd161cdc0e75740894df421 to c79099dcdc4e58f5a0d55a47b626a805a02af526 - - eeb09ed 2026-03-30T14:26:32-04:00 NE-2501: Added network policies for the router - -- machine-config-operator embedded-component 39ca98383d9b1aedf6147f9ff89e69b5a23541be to f325e92327ccfcda3ff09c09dc1b233a63fb312b - - db7b8e1e 2026-04-01T11:47:17Z MCO-2183: migrated configdrift, kubeletconfig, containerruntimeconfig and metrics e2e test cases - - 34cd2aa2 2026-03-13T17:30:09+01:00 OCPBUGS-78154: Add GetDefaultLeaderElectionConfig for MCC - - 65d648b8 2026-03-13T16:22:34+01:00 OCPBUGS-78154: Log when using HA default leader election timings - - 165da5a9 2026-03-13T15:56:37+01:00 OCPBUGS-78154: Add useDefaultTimings flag to GetLeaderElectionConfig - - f016a8e8 2026-03-13T09:58:06+01:00 Trim comment in GetLeaderElectionConfig. - - a7b45feb 2026-03-13T09:52:13+01:00 OCPBUGS-78154: Use HA leader election defaults for MCO on SNO. - -- oc image-arm64 f835dae3a861b593c4dd8b688394a61614dd6663 to 075cd278d1e62cf49b266e157891967bda16079d +- api embedded-component e9d6d439b48bfa2d127ee90c28e6d0f55243b620 to ad9eb11110b6e704efa5000c12c5fb5db1685e8a + - 72cac067 2026-04-01T14:05:14-04:00 Include candidate tier in default sippy queries for feature promotion + - 78c930f0 2026-03-31T12:59:48-04:00 Remove GCPClusterHostedDNSInstall featuregate + - a443b3b6 2026-03-26T11:21:00+01:00 CNTRLPLANE-2796: promote the event-ttl feature + +- cluster-ingress-operator embedded-component c79099dcdc4e58f5a0d55a47b626a805a02af526 to 3c1da4b8b3d4a9fbaf033f4324b5a0ffe2fbf633 + - 0da1246 2026-03-27T19:48:03-04:00 OCPBUGS-3917: Filter non-FIPS TLS 1.3 ciphers and validate effective profiles + +- cluster-kube-apiserver-operator embedded-component de2a3ebcb3ceea0ea411a6fbb9b5b52c18c27e06 to 360d3fee5c01437f857d761cff755f8b2e5004b3 + - d22154c 2026-02-23T12:19:42-05:00 scc: fix uid{Min,Max}Range for nested-container + +- cluster-kube-controller-manager-operator embedded-component 7df2876085ac1d76ac11bf476c0538876110c9f0 to b646f5481a723f5613ea45cd4a49dd716f5ae16c + - feaa384 2026-03-17T16:01:18+01:00 bindata: Import configmap-csr-controller-ca.yaml from KAS-O + +- cluster-network-operator embedded-component 594de43f4f1567e5ce55be2eff7c0cf28d1e09e7 to f3e41c5bf61313ae7408f15b263140bfc184b7d6 + - 740568c 2026-04-02T00:59:59+02:00 Add VTEP update/patch RBAC for CM + - f247bbe 2026-04-02T00:35:17+02:00 Update the CRDs for CUDN/VTEP APIs + +- machine-config-operator embedded-component f325e92327ccfcda3ff09c09dc1b233a63fb312b to c4a08067821f304642e731fdcca0c8c6a6b19484 + - b63d34cf 2026-04-02T13:40:13-05:00 Move state logging to updateConfigAndState after SetDone + - 2f270e7e 2026-04-02T09:43:18-04:00 AGENT-1416: Add default NodeDisruptionPolicy for IRI + - b7189285 2026-03-30T13:33:55-04:00 Fix order of cleanup to further avoid race + +- operator-framework-olm embedded-component 438f0e600e4ae75c8b7854afba5be963061eb2a1 to 51af59545315b37207a76f55825f397f5df13910 + - 22ef120c 2026-04-01T00:04:23Z Add fgiudici as reviewer (#3805) + +- oc image-amd64 12f8fce897cae737720309a894dac856d221485e to 075cd278d1e62cf49b266e157891967bda16079d - 075cd278 2026-04-02T11:58:36Z NO-JIRA: Add feature gate changes to changelog JSON output (#2247) + - b2332831 2026-03-31T14:21:43-04:00 NO-ISSUE: recover the context in upgrade + +- service-ca-operator image-arm64 951ea66067b4d69c868470e26a5a1a9f689be23e to 8aea4fc46ad071f3eca583c4f9c12bfa0be055ec + - ca5ae82 2026-04-02T10:20:04-04:00 fix: register informer before Start() to prevent WaitForCacheSync hang + - 9f8d755 2026-04-02T10:20:04-04:00 add feature gated PKI config support + - adc2776 2026-03-30T09:37:20-04:00 vendor: bump for openshift/library-go diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 15ff65304d..ca0903017a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,23 +1,23 @@ -https://github.com/openshift/api embedded-component e9d6d439b48bfa2d127ee90c28e6d0f55243b620 +https://github.com/openshift/api embedded-component ad9eb11110b6e704efa5000c12c5fb5db1685e8a https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 98d8223ebe55a0ddc10bb485e7603deb2c0acbb9 https://github.com/openshift/cluster-dns-operator embedded-component 3d2141182243cde1ec6417bd005c76d29aa88a01 -https://github.com/openshift/cluster-ingress-operator embedded-component c79099dcdc4e58f5a0d55a47b626a805a02af526 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component de2a3ebcb3ceea0ea411a6fbb9b5b52c18c27e06 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7df2876085ac1d76ac11bf476c0538876110c9f0 +https://github.com/openshift/cluster-ingress-operator embedded-component 3c1da4b8b3d4a9fbaf033f4324b5a0ffe2fbf633 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 360d3fee5c01437f857d761cff755f8b2e5004b3 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b646f5481a723f5613ea45cd4a49dd716f5ae16c https://github.com/openshift/cluster-kube-scheduler-operator embedded-component ddbfddb8a0c77b03c1d7c994991caa031d99c330 -https://github.com/openshift/cluster-network-operator embedded-component 594de43f4f1567e5ce55be2eff7c0cf28d1e09e7 +https://github.com/openshift/cluster-network-operator embedded-component f3e41c5bf61313ae7408f15b263140bfc184b7d6 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e0d28ec9e1c91b0b72ff66c98f7a3b126f4480ad https://github.com/openshift/cluster-policy-controller embedded-component 44985a1306411101c84dd5081598fc928b432321 https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f https://github.com/openshift/kubernetes embedded-component 9193b12ab88e006723c8605bea1659bfcbe7d638 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component f325e92327ccfcda3ff09c09dc1b233a63fb312b +https://github.com/openshift/machine-config-operator embedded-component c4a08067821f304642e731fdcca0c8c6a6b19484 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532 -https://github.com/openshift/operator-framework-olm embedded-component 438f0e600e4ae75c8b7854afba5be963061eb2a1 +https://github.com/openshift/operator-framework-olm embedded-component 51af59545315b37207a76f55825f397f5df13910 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d https://github.com/openshift/service-ca-operator embedded-component 951ea66067b4d69c868470e26a5a1a9f689be23e -https://github.com/openshift/oc image-amd64 12f8fce897cae737720309a894dac856d221485e +https://github.com/openshift/oc image-amd64 075cd278d1e62cf49b266e157891967bda16079d https://github.com/openshift/coredns image-amd64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 @@ -32,4 +32,4 @@ https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3 https://github.com/openshift/ovn-kubernetes image-arm64 ee514f9f66a328f4dd4b583709a8e411b515fa5f https://github.com/openshift/kubernetes image-arm64 9193b12ab88e006723c8605bea1659bfcbe7d638 -https://github.com/openshift/service-ca-operator image-arm64 951ea66067b4d69c868470e26a5a1a9f689be23e +https://github.com/openshift/service-ca-operator image-arm64 8aea4fc46ad071f3eca583c4f9c12bfa0be055ec diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 2b05c6657a..4f9f47212c 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.22.0-0.nightly-2026-04-01-223038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-02-213117" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-06-051707" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-06-224445"