diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 86866e5d7b..07b50d24e4 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=31 KUBE_GIT_VERSION=v1.31.14 -KUBE_GIT_COMMIT=436b373e7dec669750c65a1ef832665e56b733b7 +KUBE_GIT_COMMIT=91c24081f468e7636c824f4f5a2eb68660b81012 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index f7cb9a3f58..f579d41408 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2026-02-02-034808 +OCP_VERSION := 4.18.0-0.nightly-arm64-2026-02-11-230322 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e9ad02cf8d..9bf2b861be 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2026-01-29-211328 +OCP_VERSION := 4.18.0-0.nightly-2026-02-11-045751 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 572d3d96c9..ed16359216 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:e8adece94d998542ed5a7400aa21b89a5ca32e6d4691fc6b794784277b8ce4d2 + digest: sha256:4fe03201cbe47e09a6084d70da2333e97feff80c75e1ffdbc17165d8835d8a00 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0b81b157b74ad3d71f8a02403039a517edffc41b9759a16392c0910ddcd18b6d + digest: sha256:a7a8669f6845691a50e0efeef410ed89e214c614fc0b5361cc5f0e276030bd49 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index a8ffac8d9b..13730e439d 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:0a5fe1e20e57d7a57ef01ab3b392559c52064b10e8e0339eba4fbd7c4160f9c4 + digest: sha256:44d35f9f3775bde52498e1150b5d63b6833736cf920ae60c687300a6e437539a - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b017f338267bb2caa21d9918d78aa0b9d29c2c2557b2fdd93318635c42518155 + digest: sha256:e27a0bf7c7baf59fa68dc528d072a381ee1dd2a136d037e462f85d0355146b6f diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 173c9ccf3b..5e34fa1e90 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-02-02-034808" + "base": "4.18.0-0.nightly-arm64-2026-02-11-230322" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8adece94d998542ed5a7400aa21b89a5ca32e6d4691fc6b794784277b8ce4d2", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b81b157b74ad3d71f8a02403039a517edffc41b9759a16392c0910ddcd18b6d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fe03201cbe47e09a6084d70da2333e97feff80c75e1ffdbc17165d8835d8a00", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a8669f6845691a50e0efeef410ed89e214c614fc0b5361cc5f0e276030bd49" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index a5e3025670..f77615ea8d 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-01-29-211328" + "base": "4.18.0-0.nightly-2026-02-11-045751" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a5fe1e20e57d7a57ef01ab3b392559c52064b10e8e0339eba4fbd7c4160f9c4", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b017f338267bb2caa21d9918d78aa0b9d29c2c2557b2fdd93318635c42518155" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44d35f9f3775bde52498e1150b5d63b6833736cf920ae60c687300a6e437539a", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e27a0bf7c7baf59fa68dc528d072a381ee1dd2a136d037e462f85d0355146b6f" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index abd8fa3e7b..714ec5c90f 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:71fd1dbc396309d87881aaf47ba72063f2609df51204602cb15d80cfee36d8cd + digest: sha256:108bcfffb29c75bf7c83cc6e93189aec42d205fba2c4acea235816f67e3d8e7b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d4e7f37d6518bd750d278c153279a3f3c49fb6dcb36b9adb736f629e38ce54b + digest: sha256:71ca651772b82bba9c9dda0803333c2b90b729ba8584226446c8b294268e51fe - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:77b1d29e93061a75996f874d81f232caffc14ad6f248da73e64f92e2fac5a132 + digest: sha256:2075cf8a6eecd0e48feba1ebc0a65b3950e5e2a322c594de7e0edd0edc9a2419 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:8d4e7f37d6518bd750d278c153279a3f3c49fb6dcb36b9adb736f629e38ce54b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71ca651772b82bba9c9dda0803333c2b90b729ba8584226446c8b294268e51fe - 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:71fd1dbc396309d87881aaf47ba72063f2609df51204602cb15d80cfee36d8cd + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:108bcfffb29c75bf7c83cc6e93189aec42d205fba2c4acea235816f67e3d8e7b 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 f12f0f2675..3a1ec98e30 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:7f3fabce5ede6a002da0824f85e08469363ea74abd234e7c1acdecd832318398 + digest: sha256:18f97453b7d8aa1585af6179d62d11cc9d7096001f692831f12aa24b49ff45dd - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f713a0c3fc29fd7a0b7813ba4d42fc2ae71c56ee86a72a266c9ec89408e8d31a + digest: sha256:118b655cdb18ea65870732c909916ad269298e48318cfee8f5ce41cb7ca7aada - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c46d1c95d764e275c708194af8462ba141c323d5d988a7d26997b2fabce4b140 + digest: sha256:55ac3d23e7c5a47462d51a390be470499364010b3b383fbe9b9b7a9fadddfc0c 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:f713a0c3fc29fd7a0b7813ba4d42fc2ae71c56ee86a72a266c9ec89408e8d31a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118b655cdb18ea65870732c909916ad269298e48318cfee8f5ce41cb7ca7aada - 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:7f3fabce5ede6a002da0824f85e08469363ea74abd234e7c1acdecd832318398 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18f97453b7d8aa1585af6179d62d11cc9d7096001f692831f12aa24b49ff45dd 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 e90d6a1e72..528beeafe3 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-02-02-034808" + "base": "4.18.0-0.nightly-arm64-2026-02-11-230322" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71fd1dbc396309d87881aaf47ba72063f2609df51204602cb15d80cfee36d8cd", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d4e7f37d6518bd750d278c153279a3f3c49fb6dcb36b9adb736f629e38ce54b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b1d29e93061a75996f874d81f232caffc14ad6f248da73e64f92e2fac5a132" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:108bcfffb29c75bf7c83cc6e93189aec42d205fba2c4acea235816f67e3d8e7b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71ca651772b82bba9c9dda0803333c2b90b729ba8584226446c8b294268e51fe", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2075cf8a6eecd0e48feba1ebc0a65b3950e5e2a322c594de7e0edd0edc9a2419" } } 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 466a474acc..47024a5e98 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-01-29-211328" + "base": "4.18.0-0.nightly-2026-02-11-045751" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3fabce5ede6a002da0824f85e08469363ea74abd234e7c1acdecd832318398", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f713a0c3fc29fd7a0b7813ba4d42fc2ae71c56ee86a72a266c9ec89408e8d31a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c46d1c95d764e275c708194af8462ba141c323d5d988a7d26997b2fabce4b140" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18f97453b7d8aa1585af6179d62d11cc9d7096001f692831f12aa24b49ff45dd", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:118b655cdb18ea65870732c909916ad269298e48318cfee8f5ce41cb7ca7aada", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55ac3d23e7c5a47462d51a390be470499364010b3b383fbe9b9b7a9fadddfc0c" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 2d37c948d2..21ef0215da 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-02-02-034808" + "base": "4.18.0-0.nightly-arm64-2026-02-11-230322" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16939635c20a141ae9437f1eac72d17c1dbf55a6d2a9f7493f69887478e29ab4", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b24a406a00b04e4e374869a24ff0dcc1958e75f0a337cdd0f45ed5ac0221ca36", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98a8bdc168566e0dcc9195539ddfeaf41322f62c4a4047215d5464a596d21894", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b1d29e93061a75996f874d81f232caffc14ad6f248da73e64f92e2fac5a132", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d13cbc20274f7d6f45fd73893d6e8514491b090188bc9b51da6fff89b0d5d422", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1be6086eaa247e6b5b28c454819d0ea6c6dd99099f8c1d38bb66b880b5c0bdb", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a62b994daa29bfae25de1160057e110769f1e9bbc9a2981eb919f634810a5a7", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78f66fce582c39c289af6bf1eb705ece4969855792dfd0fe4585db36d0cc0ee0", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf231f56586b8b99fb33affc77d36b3388928be13246c2ae0618e5980cac8476", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb4dd031dbc7d05fdc46c56c0758d4f5e64228f594cad2d73ee160ddcfb5a7e5", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2075cf8a6eecd0e48feba1ebc0a65b3950e5e2a322c594de7e0edd0edc9a2419", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38ce164ef1f0cc82d75734e3a8c9ca2b882d82d232672792b175b59e766c642f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffb24e739569dd3bc396e9041ad2229893603cc38c7a5ab7ec146833542b965d", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7114879873c34cd5af061773d3f5fecb008aea71b908f45e4dcd61d28ce4283", "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:42306b2098c70d3177f7a60f0043e9ff2d46e5a4f0438af6cf8ddd40da0bbdab" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89e22243268f549bd40b375e51b4869c57e632e01756a5f1641aee4220398053" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8dff4e33b6..3e0f30cffa 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-01-29-211328" + "base": "4.18.0-0.nightly-2026-02-11-045751" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29941f21b3dabe7f097fc2c2315068df223c7f1b8b45df2aafd3650108565ed", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e01e41470594fafac4319888ac71bb9401ec74f3787b99432663d095ccb0ac86", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c99e5037ebbb3cbf9039e175033e81da52329b3adc943f40b7e21704559fe219", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c46d1c95d764e275c708194af8462ba141c323d5d988a7d26997b2fabce4b140", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3980e017b67c282bd739cd859de7e32fac0012a5690697258700ed1f6fe346c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d77b53e5a2a8ad5d67703da318a95471d4c2664e129571cdc5bcf8bb4dddb91", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45f026b1b8d3899b0872e7fd80600ea3a8251daddbd6ca23d3ac5d905cd5a37f", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b81e8e1f3feaeba9aeb047771160200f47a99fe20f4bc1589c3554e475069f8d", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d782b8bd28c02c8117d47938655871f04f71d672d246082e7c9656c4afe58954", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9ce39ec80d9469037e9c06146558b9768d3558415ce617a0df927b07f0c28a4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55ac3d23e7c5a47462d51a390be470499364010b3b383fbe9b9b7a9fadddfc0c", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c574a1df634bd7922009f4c3cc86876c77df363ce922e6f47bbd70521e13d000", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea7cf8605b4a2a37824f21770d36afc81aa0e51f6b7982c41867e7669f3a07ef", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ad27e594e37d978fefa721bf8580a886df691420d8ce08a2b21a9cbbfbe4d1c", "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:7d0a61576d2fc3b13614e428b48af83821fb39cfb91e9397601a9be406c856e1" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0fe6e8dfef68ec930df09b8732979a84138bb6fdce191d5f654a6b5c8d1dec" } } diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go index c4259daed9..31715cb557 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr.go @@ -223,8 +223,7 @@ func cidrContainsCIDR(arg ref.Val, other ref.Val) ref.Val { return types.MaybeNoSuchOverloadErr(other) } - equalMasked := cidr.Prefix.Masked() == netip.PrefixFrom(containsCIDR.Prefix.Addr(), cidr.Prefix.Bits()) - return types.Bool(equalMasked && cidr.Prefix.Bits() <= containsCIDR.Prefix.Bits()) + return types.Bool(cidr.Overlaps(containsCIDR.Prefix) && cidr.Prefix.Bits() <= containsCIDR.Prefix.Bits()) } func prefixLength(arg ref.Val) ref.Val { diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr_test.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr_test.go index 938d5953b4..fc291551af 100644 --- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr_test.go +++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver/pkg/cel/library/cidr_test.go @@ -151,11 +151,21 @@ func TestCIDR(t *testing.T) { expr: `cidr("192.168.0.0/24").containsCIDR(cidr("192.168.0.0/25"))`, expectResult: trueVal, }, + { + name: "contains CIDR ipv4 (CIDR) (/32)", + expr: `cidr("192.168.0.0/24").containsCIDR(cidr("192.168.0.1/32"))`, + expectResult: trueVal, + }, { name: "does not contain IP ipv4 (CIDR)", expr: `cidr("192.168.0.0/24").containsCIDR(cidr("192.168.0.0/23"))`, expectResult: falseVal, }, + { + name: "does not contain IP ipv4 (CIDR) (/32)", + expr: `cidr("192.168.0.0/24").containsCIDR(cidr("192.169.0.1/32"))`, + expectResult: falseVal, + }, { name: "contains CIDR ipv4 (string)", expr: `cidr("192.168.0.0/24").containsCIDR("192.168.0.0/25")`, diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index d5a1d3fe01..50cc5c2581 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:8d77b53e5a2a8ad5d67703da318a95471d4c2664e129571cdc5bcf8bb4dddb91" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea7cf8605b4a2a37824f21770d36afc81aa0e51f6b7982c41867e7669f3a07ef" 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 88b3c56d69..cce3598bd4 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:a1be6086eaa247e6b5b28c454819d0ea6c6dd99099f8c1d38bb66b880b5c0bdb" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffb24e739569dd3bc396e9041ad2229893603cc38c7a5ab7ec146833542b965d" 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 271856bc9f..cf3601a575 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,21 @@ -- kubernetes image-arm64 436b373e7dec669750c65a1ef832665e56b733b7 to 91c24081f468e7636c824f4f5a2eb68660b81012 +- cluster-kube-apiserver-operator embedded-component 416eeae4e60970f5ab52a833774c7bb60644e6af to e9bc90906c726823f154c78d3e568c98ff77b6a5 + - c3aa9e5 2026-02-05T18:49:21+00:00 Add priority field to prevent early shutdown + +- cluster-kube-scheduler-operator embedded-component 971ffbb8239a8c49f1254e5fdaab854eed224f31 to c7b51633b67e3e2860ca053930422f69e17bd40a + - d49ed9c 2026-02-05T13:57:22-05:00 Update ks_pod_scenario_3.yaml + - 9d3ee9b 2026-02-05T13:57:22-05:00 Update ks_pod_scenario_2.yaml + - ec36d40 2026-02-05T13:57:22-05:00 Update ks_pod_scenario_1.yaml + - 916812c 2026-02-05T13:57:21-05:00 Add priority field to prevent early shutdown + +- kubernetes embedded-component 436b373e7dec669750c65a1ef832665e56b733b7 to 91c24081f468e7636c824f4f5a2eb68660b81012 + - b18acb299 2025-04-08T14:24:38+00:00 UPSTREAM: 130450: Fix implementation of ContainsCIDR to allow non-equal addresses + +- ovn-kubernetes image-amd64 70a2d777ecb661c3267d24092381518f0420fa9a to 4bee86ff82e3632f99ee5926c0f8ab7a78c93f48 + - 3bbc31b3 2026-01-21T14:03:37+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync + +- kubernetes image-amd64 436b373e7dec669750c65a1ef832665e56b733b7 to 91c24081f468e7636c824f4f5a2eb68660b81012 - b18acb299 2025-04-08T14:24:38+00:00 UPSTREAM: 130450: Fix implementation of ContainsCIDR to allow non-equal addresses +- ovn-kubernetes image-arm64 70a2d777ecb661c3267d24092381518f0420fa9a to 4bee86ff82e3632f99ee5926c0f8ab7a78c93f48 + - 3bbc31b3 2026-01-21T14:03:37+01:00 fix(localnet, ipamless): Prevent LSP deletion on sync + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index cab36ed9a2..830d8e08fc 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,15 +2,15 @@ https://github.com/openshift/api embedded-component 319dc2e492034aab82d4820dd8d8 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 6fe700087e8be6513285edd18f461790fecc65c3 https://github.com/openshift/cluster-dns-operator embedded-component 7cafd0c7dca2edb154b8444602b600b5901afeba https://github.com/openshift/cluster-ingress-operator embedded-component 7ec6093b5e31b50a57eab3653dca09b1bd174fee -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 416eeae4e60970f5ab52a833774c7bb60644e6af +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9a9a437f2342dc9bba7844298b955d5f9bbc76bb -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 971ffbb8239a8c49f1254e5fdaab854eed224f31 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component c7b51633b67e3e2860ca053930422f69e17bd40a https://github.com/openshift/cluster-network-operator embedded-component f63a7ffb316c9ca4359210ff5ea2c003dbe2d6a9 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3 -https://github.com/openshift/kubernetes embedded-component 436b373e7dec669750c65a1ef832665e56b733b7 +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 0b0569287da3daea19bf47aa298037ccb4cbff98 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 @@ -22,14 +22,14 @@ https://github.com/openshift/coredns image-amd64 8ca7f02b8becb40f7a9919243000e26 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 70a2d777ecb661c3267d24092381518f0420fa9a -https://github.com/openshift/kubernetes image-amd64 436b373e7dec669750c65a1ef832665e56b733b7 +https://github.com/openshift/ovn-kubernetes image-amd64 4bee86ff82e3632f99ee5926c0f8ab7a78c93f48 +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/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 70a2d777ecb661c3267d24092381518f0420fa9a +https://github.com/openshift/ovn-kubernetes image-arm64 4bee86ff82e3632f99ee5926c0f8ab7a78c93f48 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 80831c38ba..6365364b14 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-01-29-211328" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-02-02-034808" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-02-11-045751" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-02-11-230322" diff --git a/vendor/k8s.io/apiserver/pkg/cel/library/cidr.go b/vendor/k8s.io/apiserver/pkg/cel/library/cidr.go index c4259daed9..31715cb557 100644 --- a/vendor/k8s.io/apiserver/pkg/cel/library/cidr.go +++ b/vendor/k8s.io/apiserver/pkg/cel/library/cidr.go @@ -223,8 +223,7 @@ func cidrContainsCIDR(arg ref.Val, other ref.Val) ref.Val { return types.MaybeNoSuchOverloadErr(other) } - equalMasked := cidr.Prefix.Masked() == netip.PrefixFrom(containsCIDR.Prefix.Addr(), cidr.Prefix.Bits()) - return types.Bool(equalMasked && cidr.Prefix.Bits() <= containsCIDR.Prefix.Bits()) + return types.Bool(cidr.Overlaps(containsCIDR.Prefix) && cidr.Prefix.Bits() <= containsCIDR.Prefix.Bits()) } func prefixLength(arg ref.Val) ref.Val {