diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 3fc325df4a..aad8d95388 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=33 KUBE_GIT_VERSION=v1.33.5 -KUBE_GIT_COMMIT=cf396bff09dcb68a96f718b5e0e80b50e874afb5 +KUBE_GIT_COMMIT=4c392f99fc20a9a5407d8e640c557a47efc7dae2 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 717ae7b5db..6f9062e359 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2025-11-17-033055 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-11-20-012430 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 2baad57824..1ab3d6d750 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2025-11-15-175712 +OCP_VERSION := 4.20.0-0.nightly-2025-11-19-223643 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index ace27ba5ed..6c628b0c01 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:2c9f3befe925a25f6859ce8ea69da2721c9cae8ee5cc0682e42c78ac102f425a + digest: sha256:3ffb717ed3cb11466c8a2226d9b5361525db68099dce2005e08382904430265c - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cce21af5cdce8e943f962089e1d304dd2d9b573eeff0a8bbbf5f610ed1d90c25 + digest: sha256:8c19b3f71d8225934d1d293a137ed395832b127e7d185d7ba98b942445b59da5 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index a42249bf4c..c521ed145f 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:62ad772322e9350c419a7532c93a2154345ca707c1712332d1bc8d5451cec9e9 + digest: sha256:2ef01150ef0bf04da1e2ec60ea38747edc782a53ea88184612563936ecb95ef5 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:036b07d5a4e281b665da2caecd8f14f25ee5f8c797cf1dfe8207d590dd92d922 + digest: sha256:2e492eea4f00fa1b4dd10c8470dbac49d3698a2e905aa1678f2cd17c93d7de50 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 791099e640..3e54b4607b 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-11-17-033055" + "base": "4.20.0-0.nightly-arm64-2025-11-20-012430" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c9f3befe925a25f6859ce8ea69da2721c9cae8ee5cc0682e42c78ac102f425a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cce21af5cdce8e943f962089e1d304dd2d9b573eeff0a8bbbf5f610ed1d90c25" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffb717ed3cb11466c8a2226d9b5361525db68099dce2005e08382904430265c", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c19b3f71d8225934d1d293a137ed395832b127e7d185d7ba98b942445b59da5" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 12aa225cee..7d95ad4d41 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.20.0-0.nightly-2025-11-15-175712" + "base": "4.20.0-0.nightly-2025-11-19-223643" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62ad772322e9350c419a7532c93a2154345ca707c1712332d1bc8d5451cec9e9", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:036b07d5a4e281b665da2caecd8f14f25ee5f8c797cf1dfe8207d590dd92d922" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef01150ef0bf04da1e2ec60ea38747edc782a53ea88184612563936ecb95ef5", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e492eea4f00fa1b4dd10c8470dbac49d3698a2e905aa1678f2cd17c93d7de50" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index e9af7c5e92..39086d4451 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:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c + digest: sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a + digest: sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951 + digest: sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59 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:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3 - 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:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a 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 b6eb749a7e..ce65e7be2c 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:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38 + digest: sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416 + digest: sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a + digest: sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c 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:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d - 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:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5 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 3e98feff07..039ec029e0 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.20.0-0.nightly-arm64-2025-11-17-033055" + "base": "4.20.0-0.nightly-arm64-2025-11-20-012430" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:527451a21b1330ced29ac56f5ae1b74df5fbe5732faf22aac59c9699a7f7431c", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cfe880c7d7980bdfdec6558858e76770503b20fdd990c32bf2d43d9ef6aa75a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b825ec2130445bab9bc59c0a87a65d92137733bbc80f72f68c4a25f627fd0e5a", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52387e0b76b04d728e6016c4793a75c2e64537d2c730f1742b9f5ae32ae3af3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59" } } 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 fd93f4bb4f..d436df8539 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.20.0-0.nightly-2025-11-15-175712" + "base": "4.20.0-0.nightly-2025-11-19-223643" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89d99bbbd05ee26d798babb0cf0ab7f6b19a75e4ad15c9789604a459f7c54f38", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20795e1af5d056c0925618829c8663404ce84691b5a2f74c25fa84e4e0415416", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:402863b1fbb1c29e786cecd686b5ae1ff96dd134b6506c525585bd7f43836aa5", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffec944d864f564dc7fabb52fb9a5fdfd6885fcbf3bc2121a784c84458aba97d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 18f472729e..80e8c4577d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-11-17-033055" + "base": "4.20.0-0.nightly-arm64-2025-11-20-012430" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16dcabdf4cbebf4a77f0fb2acb32ecb2194624b597b9b3f97c4195479970711a", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d75edfb182da649739a16b0facdbffa3e257f0beaa0ba1a18dde1c960b036259", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7cdd79a41e4122e77459cbf45a2d3a6a2439b984b1cc6dca05d64a499e07f529", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2fba135636745ee6928bc95710c91cfe4bdcfe5a2dfc11b1df615bdf5eb5c951", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae51d770255a488f0f7acba466fdb54c3fb8f23cd1c8b36090bdf3e9364f050e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c64b1d9e6729413d117b842dce2cea576abb2fa4da3acfb749c260f197aaf2d", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c50c56d9ed378f1d56fdfadbea5ba3c35c9d34a73c74200b0e7b160e6e74a364", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d3bdb5d7be9fd8d97a91231f52aaef08d85bcb0fd19b32efe4d2f0f6ed1b311", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fe05ff07d6cc1830570829f83386bca466fe5d28eb9a431aa7c89ed3c09b052", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75569027058b4a79dcda7d12517876f9c8e5b456d8cbe9a630ac5c8f2439b20e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f5c4dc3ceac1e46d08f261d1dbe4e96ac3e57c3d6ab720cf7f96ad0ef9fd59", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:741cb2e90084b290c0e995ff0a7e8f604a80ff23aec77c983b6b35051795a125", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:270fb8392077c5f0c3b62512788e90dfe34982efd00e2b10864e6394dda287e5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfd1a04aac1158eda3602f8968a195c3f0bee9e3d53ccf1024cf43b2acfe6624", "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:c670b44f4f54a6ba29c8ed36d6446810d3e763007576369d952978817c1084a4" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c843c993fa5ce434bc9114771c8f524f130a54b0adbe4579ce97cd80dd85e03f" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 63db6ef786..266017e162 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-2025-11-15-175712" + "base": "4.20.0-0.nightly-2025-11-19-223643" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:564a108b5a36f7e29cecb88f1a0da0141a433f8ec96085a300a9b09ec8778e62", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53e8cb135e9bfa1252084d31a4373295f5d33ee31d72772e6c1ca33312c8d63e", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a557ae1aca845cb65c22982cf50fe05a9c80332a7b2d591f3bdc1456781c0678", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50bd0534299e20862a56412d2f3e27237c8c2a0971a5b74789355e920f1cf77a", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdbe11fc56900aa849f0433695d6c06435c917717dfeb9fd78239149e0f08080", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3b1c8cad41f6984b39a9aa94b0073720283a5fb59c0b28f161bd9b419f64469", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e2a309c9c0f9d3185566117b6236e201b294b83cfad1c633ddaf53cc85179f6", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b80ebd7b42a4c0857e4d452c3c1e24c06bfe4402c83ebc1ce5a4a4bfe1d7fc", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b5e4c57813bd627974e4d93754f9f3bc00615f113b0be4d005e0ce37980f567", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2ba53115137b945001e52f33ef3fca741c875b4b89e8b836a0c664f2b6a52d9", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f13164acac5000249ed5c9fd11ae954e7be937056a80e866612a71cef61b124c", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bbc23085eb7295b45032ee7610098527cedef780e2583c056650f96a955a0be", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1befb1f3a5052734b33a797d875a85dacd2ccce01c9b694261a8531ef3e216fe", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69c696f24be1244c592067732bb5c1acc34674d32c8c7d9ee53eac65426a87d6", "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:f2f50c89e1034b8cc11de83528716f554b7dd06e965525f8f356538bdd511909" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8662102d2b5d4e4993136f3570c9d81859149f574764a5ecb1cfc4a12faaf68" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index c5da8435aa..f165f7f944 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:c3b1c8cad41f6984b39a9aa94b0073720283a5fb59c0b28f161bd9b419f64469" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1befb1f3a5052734b33a797d875a85dacd2ccce01c9b694261a8531ef3e216fe" 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 100ddda125..782dc01876 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:4c64b1d9e6729413d117b842dce2cea576abb2fa4da3acfb749c260f197aaf2d" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:270fb8392077c5f0c3b62512788e90dfe34982efd00e2b10864e6394dda287e5" 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 117540faf8..6e1345d08e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,51 +1,27 @@ -- api embedded-component 41627d81e9c18fbcc3f7ff6de2ba50e0b98435c4 to 1886180ef4300f41168c2d498e0acecd02fa2a48 - - b63356e5 2025-11-10T08:11:28+00:00 payload-command: remove authentication CR from hypershift payload - - 88a5beb6 2025-10-02T14:03:34+02:00 promote BYO OIDC features - -- machine-config-operator embedded-component 0c58628362f7471071da6d0263fa65766691f28c to 1f11aef23bd1a7d89fba38480451e2404e00f3a3 - - 716253bd 2025-11-13T08:54:48-05:00 remove check for conflicting ClusterImagePolicy in syncUpgradeableStatus - - 1d87d4d6 2025-11-11T17:16:10-05:00 consider UID when determining MOSB existence - - 71b2a93a 2025-11-11T17:16:10-05:00 adds additional checks to annotation test - - 8087d190 2025-11-11T17:16:10-05:00 speed up e2e-ocl by deleting build pods - - bf110c42 2025-11-11T17:16:10-05:00 install skopeo from source, when missing - - a8836dfc 2025-11-11T17:16:10-05:00 move kernel type test into rollout test - - d68415fb 2025-11-11T17:16:09-05:00 e2e test should check for init container status instead of overall pod status - - faff3862 2025-11-11T17:16:09-05:00 check whether the image exists before trying to reuse it for MachineConfigPools - - 377bd216 2025-11-11T17:16:03-05:00 detect if image exists or access is denied - - 87bdf1fe 2025-11-07T12:08:34-05:00 Implement upgrade blocking for conflicting ClusterImagePolicy named "openshift" - - 4e665d9f 2025-11-07T11:24:53+05:30 units: add delays to TestOSBuildController - -- oc image-amd64 0581d703b56b153b941022bca4ce3c34de576f3c to 0808e14637d72c01a3cb50e41617576836e84524 - - ee2ffd6b 2025-11-12T14:05:01+00:00 fix(must-gather): do not set node affinity if nodename is set - -- ovn-kubernetes image-amd64 c7e12ae3e00d8fdc6744815370e450bcc68c0dac to 798404b42c0fd11b62973803dbc53810fd4f7fee - - f4e2c179 2025-11-07T13:01:19+01:00 Fix cleanup of LRP for deleted pods - - b8303a2a 2025-11-07T13:01:08+01:00 Handle missing pod delete event in EIP controller - - 7060af6c 2025-11-07T12:59:46+01:00 EgressIP: fix failover and restart stale SNAT/LRP; ensure status sync - - c337b162 2025-11-07T12:59:46+01:00 OVN EIP: fix printing of stale next hops value - - 562c7495 2025-11-07T12:59:46+01:00 OVN EIP: add UT for syncing next hops for v4/v6 - - 6f6edf31 2025-11-07T12:59:46+01:00 EIP: do not skip generating potential valid next hops if LSP not found - - 688885f1 2025-11-07T12:59:46+01:00 EIP: when checking for stale LRP next hops on startup, restrict to enodes - - a3a48276 2025-11-05T19:33:25+01:00 E2E service: Add test for named port handling with ETP=Local services - - b2b17a22 2025-11-05T19:32:14+01:00 E2E service: Fix potential flake in conn to an ext IP using src port - - 87b946bf 2025-11-05T19:32:14+01:00 E2E service: Move checkNumberOf.. to util.go - - 9bab81f3 2025-11-05T19:32:14+01:00 Extends unit test coverage for named port handling in ETP local - - 8c50a8dc 2025-11-05T19:32:11+01:00 Fix named port handling in externalTrafficPolicy Local services - -- oc image-arm64 0581d703b56b153b941022bca4ce3c34de576f3c to 0808e14637d72c01a3cb50e41617576836e84524 - - ee2ffd6b 2025-11-12T14:05:01+00:00 fix(must-gather): do not set node affinity if nodename is set - -- ovn-kubernetes image-arm64 c7e12ae3e00d8fdc6744815370e450bcc68c0dac to 798404b42c0fd11b62973803dbc53810fd4f7fee - - f4e2c179 2025-11-07T13:01:19+01:00 Fix cleanup of LRP for deleted pods - - b8303a2a 2025-11-07T13:01:08+01:00 Handle missing pod delete event in EIP controller - - 7060af6c 2025-11-07T12:59:46+01:00 EgressIP: fix failover and restart stale SNAT/LRP; ensure status sync - - c337b162 2025-11-07T12:59:46+01:00 OVN EIP: fix printing of stale next hops value - - 562c7495 2025-11-07T12:59:46+01:00 OVN EIP: add UT for syncing next hops for v4/v6 - - 6f6edf31 2025-11-07T12:59:46+01:00 EIP: do not skip generating potential valid next hops if LSP not found - - 688885f1 2025-11-07T12:59:46+01:00 EIP: when checking for stale LRP next hops on startup, restrict to enodes - - a3a48276 2025-11-05T19:33:25+01:00 E2E service: Add test for named port handling with ETP=Local services - - b2b17a22 2025-11-05T19:32:14+01:00 E2E service: Fix potential flake in conn to an ext IP using src port - - 87b946bf 2025-11-05T19:32:14+01:00 E2E service: Move checkNumberOf.. to util.go - - 9bab81f3 2025-11-05T19:32:14+01:00 Extends unit test coverage for named port handling in ETP local - - 8c50a8dc 2025-11-05T19:32:11+01:00 Fix named port handling in externalTrafficPolicy Local services +- cluster-kube-apiserver-operator embedded-component a3414ab9e446c5511cc8bc1011a859ecfcf5c610 to 974542ae2ef86a631546b3a48fd0da3c2e3b74dd + - 93fb829 2025-09-29T16:33:57-04:00 enable resource v1beta2 api if DynamicResourceAllocation is enabled + +- cluster-network-operator embedded-component 1666a71c205071b6d44bfa57c0ebd3f0054fa1cd to 45843d223ceaea458879da3ee58d89ce1863230b + - a984a49 2025-10-28T10:34:52-04:00 Add a ValidatingAdmissionPolicy blocking ServiceCIDR changes + +- kubernetes embedded-component cf396bff09dcb68a96f718b5e0e80b50e874afb5 to 4c392f99fc20a9a5407d8e640c557a47efc7dae2 + - 82b56a1e2 2025-09-03T09:10:23-04:00 UPSTREAM: 133625: Remove patch/update from ServiceCIDR API conformance test + +- oc image-amd64 0808e14637d72c01a3cb50e41617576836e84524 to 0963a015e8051f256030f1af5895d5640530fa23 + - c792deb4 2025-11-11T20:07:21+00:00 pkg/cli/admin/upgrade: Tighten force warnings + +- ovn-kubernetes image-amd64 798404b42c0fd11b62973803dbc53810fd4f7fee to 0f330d1959be2f19f88a0df27889a7cdac0224b0 + - 860cc8dc 2025-11-12T15:30:03-08:00 add lint target to run golanci natively + +- kubernetes image-amd64 cf396bff09dcb68a96f718b5e0e80b50e874afb5 to 4c392f99fc20a9a5407d8e640c557a47efc7dae2 + - 82b56a1e2 2025-09-03T09:10:23-04:00 UPSTREAM: 133625: Remove patch/update from ServiceCIDR API conformance test + +- oc image-arm64 0808e14637d72c01a3cb50e41617576836e84524 to 0963a015e8051f256030f1af5895d5640530fa23 + - c792deb4 2025-11-11T20:07:21+00:00 pkg/cli/admin/upgrade: Tighten force warnings + +- ovn-kubernetes image-arm64 798404b42c0fd11b62973803dbc53810fd4f7fee to 0f330d1959be2f19f88a0df27889a7cdac0224b0 + - 860cc8dc 2025-11-12T15:30:03-08:00 add lint target to run golanci natively + +- kubernetes image-arm64 cf396bff09dcb68a96f718b5e0e80b50e874afb5 to 4c392f99fc20a9a5407d8e640c557a47efc7dae2 + - 82b56a1e2 2025-09-03T09:10:23-04:00 UPSTREAM: 133625: Remove patch/update from ServiceCIDR API conformance test diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index f45c1a7173..cf1315dfad 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,34 +2,34 @@ https://github.com/openshift/api embedded-component 1886180ef4300f41168c2d498e0a https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 019abe0c7671962829eb91269e1d76916966320e https://github.com/openshift/cluster-dns-operator embedded-component 82578923164636746e0d74d594ab32d83a660c0b https://github.com/openshift/cluster-ingress-operator embedded-component 2371120eedb27049160c70859ef9972a7599c7e3 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a3414ab9e446c5511cc8bc1011a859ecfcf5c610 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 974542ae2ef86a631546b3a48fd0da3c2e3b74dd https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 438c9dba80ddadeabe9efe4a654297a7b550b2b8 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 58cbd296eecc61c0871739588ae65af9c05e87a6 -https://github.com/openshift/cluster-network-operator embedded-component 1666a71c205071b6d44bfa57c0ebd3f0054fa1cd +https://github.com/openshift/cluster-network-operator embedded-component 45843d223ceaea458879da3ee58d89ce1863230b https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component aa455c043152123595c2b4f72e02279aad9dd48a https://github.com/openshift/cluster-policy-controller embedded-component 47c783103216aa5e1242632127a5d8f98b8b7455 https://github.com/openshift/csi-external-snapshotter embedded-component 42604822c25eb2aa0ecb017c24e328221b238eb9 https://github.com/openshift/etcd embedded-component eac09c01677bb03daed156d407be27785fd61e0d -https://github.com/openshift/kubernetes embedded-component cf396bff09dcb68a96f718b5e0e80b50e874afb5 +https://github.com/openshift/kubernetes embedded-component 4c392f99fc20a9a5407d8e640c557a47efc7dae2 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953 https://github.com/openshift/machine-config-operator embedded-component 1f11aef23bd1a7d89fba38480451e2404e00f3a3 https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e https://github.com/openshift/operator-framework-olm embedded-component dd6d22bd02554c039e7bbec4bf39c6e97ebf0b9b https://github.com/openshift/route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20 https://github.com/openshift/service-ca-operator embedded-component 37e0c31790b6a954214817974a56c9a699d0cf78 -https://github.com/openshift/oc image-amd64 0808e14637d72c01a3cb50e41617576836e84524 +https://github.com/openshift/oc image-amd64 0963a015e8051f256030f1af5895d5640530fa23 https://github.com/openshift/coredns image-amd64 6f39336e6da9dc77b2db140a96773c413d50a665 https://github.com/openshift/csi-external-snapshotter image-amd64 42604822c25eb2aa0ecb017c24e328221b238eb9 https://github.com/openshift/router image-amd64 96bfd2164c7885df9019ce9eeb79d506bd7e871b https://github.com/openshift/kube-rbac-proxy image-amd64 b9134351be37c43408334047d8eb85d0ac01fe4e -https://github.com/openshift/ovn-kubernetes image-amd64 798404b42c0fd11b62973803dbc53810fd4f7fee -https://github.com/openshift/kubernetes image-amd64 cf396bff09dcb68a96f718b5e0e80b50e874afb5 +https://github.com/openshift/ovn-kubernetes image-amd64 0f330d1959be2f19f88a0df27889a7cdac0224b0 +https://github.com/openshift/kubernetes image-amd64 4c392f99fc20a9a5407d8e640c557a47efc7dae2 https://github.com/openshift/service-ca-operator image-amd64 37e0c31790b6a954214817974a56c9a699d0cf78 -https://github.com/openshift/oc image-arm64 0808e14637d72c01a3cb50e41617576836e84524 +https://github.com/openshift/oc image-arm64 0963a015e8051f256030f1af5895d5640530fa23 https://github.com/openshift/coredns image-arm64 6f39336e6da9dc77b2db140a96773c413d50a665 https://github.com/openshift/csi-external-snapshotter image-arm64 42604822c25eb2aa0ecb017c24e328221b238eb9 https://github.com/openshift/router image-arm64 96bfd2164c7885df9019ce9eeb79d506bd7e871b https://github.com/openshift/kube-rbac-proxy image-arm64 b9134351be37c43408334047d8eb85d0ac01fe4e -https://github.com/openshift/ovn-kubernetes image-arm64 798404b42c0fd11b62973803dbc53810fd4f7fee -https://github.com/openshift/kubernetes image-arm64 cf396bff09dcb68a96f718b5e0e80b50e874afb5 +https://github.com/openshift/ovn-kubernetes image-arm64 0f330d1959be2f19f88a0df27889a7cdac0224b0 +https://github.com/openshift/kubernetes image-arm64 4c392f99fc20a9a5407d8e640c557a47efc7dae2 https://github.com/openshift/service-ca-operator image-arm64 37e0c31790b6a954214817974a56c9a699d0cf78 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 36b4294d8d..6b953c9377 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.20.0-0.nightly-2025-11-15-175712" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-11-17-033055" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-11-19-223643" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-11-20-012430"