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..305401a32e 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-23-005423 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e9ad02cf8d..3c58b134d1 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-22-175353 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 572d3d96c9..d041693eff 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:8a39efc6b7836802c53841a3df76061867467d0fa54253e4907b4a6894563f07 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0b81b157b74ad3d71f8a02403039a517edffc41b9759a16392c0910ddcd18b6d + digest: sha256:31c38cfd614da8b7c35347248690bdb1ac6c1be8f0d1ead952f997316a7daf59 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index a8ffac8d9b..b8039cabab 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:642ba0bb2ccbdc4df22210117a41496417a66faec883ec7effd81ff5ec021f43 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b017f338267bb2caa21d9918d78aa0b9d29c2c2557b2fdd93318635c42518155 + digest: sha256:b07d6f50040cb46c9823718cfe7676f560d9effda9f22d03864b5b155143d180 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 173c9ccf3b..366b797af5 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-23-005423" }, "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:8a39efc6b7836802c53841a3df76061867467d0fa54253e4907b4a6894563f07", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31c38cfd614da8b7c35347248690bdb1ac6c1be8f0d1ead952f997316a7daf59" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index a5e3025670..73dc00ba62 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-22-175353" }, "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:642ba0bb2ccbdc4df22210117a41496417a66faec883ec7effd81ff5ec021f43", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b07d6f50040cb46c9823718cfe7676f560d9effda9f22d03864b5b155143d180" } } diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml index ebec29236f..fe8908540d 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml @@ -32,9 +32,6 @@ spec: - name: srv-cert secret: secretName: olm-operator-serving-cert - - name: profile-collector-cert - secret: - secretName: pprof-cert containers: - name: olm-operator securityContext: @@ -45,9 +42,6 @@ spec: - name: srv-cert mountPath: "/srv-cert" readOnly: true - - name: profile-collector-cert - mountPath: "/profile-collector-cert" - readOnly: true command: - /bin/olm args: @@ -57,8 +51,6 @@ spec: - /srv-cert/tls.crt - --tls-key - /srv-cert/tls.key - - --client-ca - - /profile-collector-cert/tls.crt - --protectedCopiedCSVNamespaces - openshift image: quay.io/operator-framework/olm diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml index 9b5370c81e..d493387f78 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml @@ -32,9 +32,6 @@ spec: - name: srv-cert secret: secretName: catalog-operator-serving-cert - - name: profile-collector-cert - secret: - secretName: pprof-cert containers: - name: catalog-operator securityContext: @@ -45,9 +42,6 @@ spec: - name: srv-cert mountPath: "/srv-cert" readOnly: true - - name: profile-collector-cert - mountPath: "/profile-collector-cert" - readOnly: true command: - /bin/catalog args: @@ -63,8 +57,6 @@ spec: - /srv-cert/tls.crt - --tls-key - /srv-cert/tls.key - - --client-ca - - /profile-collector-cert/tls.crt - --set-workload-user-id=false image: quay.io/operator-framework/olm imagePullPolicy: IfNotPresent diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index abd8fa3e7b..cdc125ea09 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:555509b2230551a0ed88f125277cd868287efdbeec5b5c5d795651c95177b4ca - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8d4e7f37d6518bd750d278c153279a3f3c49fb6dcb36b9adb736f629e38ce54b + digest: sha256:efb41f5175253cbca2a0a8671c8df84d75aaf2ad035f5a4fb0ab990bba7af1ea - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:77b1d29e93061a75996f874d81f232caffc14ad6f248da73e64f92e2fac5a132 + digest: sha256:1b42e2638fe48d48c6a6256be444fcb8c3fe7c60a60cb7f358ec9ff9b179545a 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:efb41f5175253cbca2a0a8671c8df84d75aaf2ad035f5a4fb0ab990bba7af1ea - 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:555509b2230551a0ed88f125277cd868287efdbeec5b5c5d795651c95177b4ca 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..0f3c353db1 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:41dbd66e9a886c1fd7a99752f358c6125a209e83c0dd37b35730baae58d82ee8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f713a0c3fc29fd7a0b7813ba4d42fc2ae71c56ee86a72a266c9ec89408e8d31a + digest: sha256:ff40e33e63d6c1f4e4393d5506e38def25ba20582d980fec8b81f81c867ceeec - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c46d1c95d764e275c708194af8462ba141c323d5d988a7d26997b2fabce4b140 + digest: sha256:8677f7a973553c25d282bc249fc8bc0f5aa42fb144ea0956d1f04c5a6cd80501 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:ff40e33e63d6c1f4e4393d5506e38def25ba20582d980fec8b81f81c867ceeec - 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:41dbd66e9a886c1fd7a99752f358c6125a209e83c0dd37b35730baae58d82ee8 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..0b3f60794c 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-23-005423" }, "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:555509b2230551a0ed88f125277cd868287efdbeec5b5c5d795651c95177b4ca", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efb41f5175253cbca2a0a8671c8df84d75aaf2ad035f5a4fb0ab990bba7af1ea", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b42e2638fe48d48c6a6256be444fcb8c3fe7c60a60cb7f358ec9ff9b179545a" } } 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..881ed5f839 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-22-175353" }, "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:41dbd66e9a886c1fd7a99752f358c6125a209e83c0dd37b35730baae58d82ee8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff40e33e63d6c1f4e4393d5506e38def25ba20582d980fec8b81f81c867ceeec", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8677f7a973553c25d282bc249fc8bc0f5aa42fb144ea0956d1f04c5a6cd80501" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 2d37c948d2..2c7558ecdd 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-23-005423" }, "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:4182b234de2fb5ea955a1f694c7df9b915f35c5f8c5f9330bbbc9ea2303cb359", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8d2372ccdf6fd70274bad7fa3652e5c8c0283b745587017d5f731fab7fa4da7", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d633d70047613a671085cf29334ee7e5ef8e1680e88f5bb403dd74638596c3cd", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b42e2638fe48d48c6a6256be444fcb8c3fe7c60a60cb7f358ec9ff9b179545a", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77613b46fac78270ff31ec470bb33e0badfa9c60ffb39ff02ce1c9c383d1b537", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd703c9e44ceb6515eb98161171c6002bf78d6f85bb95d7f54363feeff18567f", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:030625218e9073c3f4532fe785167f72cf6946f789f7d47e95f42f633f9a0888", "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:4993ae6b0ab806f633d641f6283ca003d802eb3aa54fa3124d76616274baa489" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 8dff4e33b6..de9ed74c8e 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-22-175353" }, "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:1575be013a898f153cbf012aeaf28ce720022f934dc05bdffbe479e30999d460", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c54c3f7cffe057ae0bdf26163d5e46744685083ae16fc97112e32beacd2d8955", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b2e765b795c30c910c331c85226e5db0d56463b6c81d79ded739cba76e2b032", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8677f7a973553c25d282bc249fc8bc0f5aa42fb144ea0956d1f04c5a6cd80501", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e3db88b14cfa5d3293757aa0dbdf7d3647684ab8c4cc267503b9556d23b6bbc", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d605384f31a8085f78a96145c2c3dc51afe22721144196140a2699b7c07ebe3", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7220d16ea511c0f0410cf45db45aaafcc64847c9cb5732ad1eff39ceb482cdba", "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:3a85dab5856916220df6f05ce9d6aa10cd4fa0234093b55355246690bba05ad1" } } 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..09ee2406f2 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:1d605384f31a8085f78a96145c2c3dc51afe22721144196140a2699b7c07ebe3" 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..0f7b2d7cc7 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:fd703c9e44ceb6515eb98161171c6002bf78d6f85bb95d7f54363feeff18567f" 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..6d0eb8064c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,35 @@ -- 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-controller-manager-operator embedded-component 9a9a437f2342dc9bba7844298b955d5f9bbc76bb to 6347fc8179b2a04d51c99432ae612bf4df595dc0 + - a3ccc2c 2026-02-05T13:59:13-05: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 +- machine-config-operator embedded-component 0b0569287da3daea19bf47aa298037ccb4cbff98 to 0426a839024087818b02201a1c44deec4d16f904 + - 52cd8505 2026-02-18T10:39:13-06:00 fixes exposure of sensitive data in log files + - d9c75d7a 2026-02-11T18:48:08+03:00 Add hostIP 127.0.0.1 to machine-config-daemon port 8798 + - 352749e7 2026-02-11T18:47:59+03:00 add a relevant svc to the crio port + - 93ade935 2026-02-11T18:46:50+03:00 add missing ports in contaiterport on the daemoset + +- operator-framework-olm embedded-component 357bb130e6149ef87afbaadd6677ab1f71876d53 to c2df9e7c6ccac3489c833a03cfa3518d5eedf01f + - 096873a0 2026-02-13T21:17:41+00:00 fixup! Remove the collect-profiles job + - 267547d4 2026-02-13T21:17:40+00:00 fixup! Remove the collect-profiles job + - cd9d4dc4 2026-02-13T21:17:40+00:00 Remove the collect-profiles job + +- 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..99d5f493f6 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,19 +2,19 @@ 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-controller-manager-operator embedded-component 9a9a437f2342dc9bba7844298b955d5f9bbc76bb -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 971ffbb8239a8c49f1254e5fdaab854eed224f31 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e9bc90906c726823f154c78d3e568c98ff77b6a5 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6347fc8179b2a04d51c99432ae612bf4df595dc0 +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/machine-config-operator embedded-component 0426a839024087818b02201a1c44deec4d16f904 https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 -https://github.com/openshift/operator-framework-olm embedded-component 357bb130e6149ef87afbaadd6677ab1f71876d53 +https://github.com/openshift/operator-framework-olm embedded-component c2df9e7c6ccac3489c833a03cfa3518d5eedf01f https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539 https://github.com/openshift/oc image-amd64 3a48fc2998a051a77a97cc3393b5d189c22635e0 @@ -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..e0b7b7a4b5 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-22-175353" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-02-23-005423" 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 {