diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b5fb088b01..f1000f02f0 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2026-02-16-001612 +OCP_VERSION := 4.17.0-0.nightly-arm64-2026-03-02-081840 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 8afb516291..cbf16d8a12 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2026-02-15-171929 +OCP_VERSION := 4.17.0-0.nightly-2026-03-02-093637 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 0c00629a31..5541dfba78 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:35fbdf8b8b9e02f2faf2165465cc1661b18cdcce05bc85576ba5f4b958d4fe26 + digest: sha256:27905b8e5ff0b3a0d0463e38cb0fa3f26bf668ee527553d5c1486a033f5150b5 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2b2eaa6cb89cdb9f43020ecbc7c8a1db00282864513b9195da12fc3e4a95f847 + digest: sha256:647070f6ad6552c73ca4f617dd32a4fe2055eb40363c48cf31d11e1469638112 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 41a81f2ccc..a85a425c6b 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:bbe3f967bbfde6d7673116cf018d1fb77e774edcde42c469fa453f9323eaedb1 + digest: sha256:1e1b35f526c6c95511f95215a532b02bd0f5bb9a398c63d82ea9c01491f2256b - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5d69edc977280d4e041d7e2a7dfe9d1feb8b79691868ba8323cf1b9f63535d88 + digest: sha256:2f3642da55a09eeb592ee0168c31da87ffd84c02b525d59a91db6d780e3d7bc3 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index f5314caf1c..34bedc699e 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2026-02-16-001612" + "base": "4.17.0-0.nightly-arm64-2026-03-02-081840" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35fbdf8b8b9e02f2faf2165465cc1661b18cdcce05bc85576ba5f4b958d4fe26", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b2eaa6cb89cdb9f43020ecbc7c8a1db00282864513b9195da12fc3e4a95f847" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27905b8e5ff0b3a0d0463e38cb0fa3f26bf668ee527553d5c1486a033f5150b5", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:647070f6ad6552c73ca4f617dd32a4fe2055eb40363c48cf31d11e1469638112" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 6fae9b13f1..aa97420399 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.17.0-0.nightly-2026-02-15-171929" + "base": "4.17.0-0.nightly-2026-03-02-093637" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbe3f967bbfde6d7673116cf018d1fb77e774edcde42c469fa453f9323eaedb1", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d69edc977280d4e041d7e2a7dfe9d1feb8b79691868ba8323cf1b9f63535d88" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e1b35f526c6c95511f95215a532b02bd0f5bb9a398c63d82ea9c01491f2256b", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f3642da55a09eeb592ee0168c31da87ffd84c02b525d59a91db6d780e3d7bc3" } } diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-config.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-config.yaml deleted file mode 100644 index b7313efce9..0000000000 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/create-only: "true" - capability.openshift.io/name: "OperatorLifecycleManager" - name: collect-profiles-config - namespace: openshift-operator-lifecycle-manager -data: - pprof-config.yaml: | - disabled: False diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-rbac.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-rbac.yaml deleted file mode 100644 index d874c74a25..0000000000 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-rbac.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/self-managed-high-availability: "true" - capability.openshift.io/name: "OperatorLifecycleManager" - name: collect-profiles - namespace: openshift-operator-lifecycle-manager -rules: - - apiGroups: [""] - resources: ["configmaps"] - verbs: ["get", "list", "create", "delete"] - - apiGroups: [""] - resources: ["secrets"] - verbs: ["get", "update"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/self-managed-high-availability: "true" - capability.openshift.io/name: "OperatorLifecycleManager" - name: collect-profiles - namespace: openshift-operator-lifecycle-manager -subjects: - - kind: ServiceAccount - name: collect-profiles - namespace: openshift-operator-lifecycle-manager -roleRef: - kind: Role - name: collect-profiles - apiGroup: rbac.authorization.k8s.io ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/self-managed-high-availability: "true" - capability.openshift.io/name: "OperatorLifecycleManager" - name: collect-profiles - namespace: openshift-operator-lifecycle-manager diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-secret.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-secret.yaml deleted file mode 100644 index 5035a25523..0000000000 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-secret.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - annotations: - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/create-only: "true" - openshift.io/owning-component: "Operator Framework / operator-lifecycle-manager" - capability.openshift.io/name: "OperatorLifecycleManager" - name: pprof-cert - namespace: openshift-operator-lifecycle-manager -type: kubernetes.io/tls -data: - tls.crt: "" - tls.key: "" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_01-olm-operator.serviceaccount.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_02-olm-operator.serviceaccount.yaml similarity index 100% rename from assets/optional/operator-lifecycle-manager/0000_50_olm_01-olm-operator.serviceaccount.yaml rename to assets/optional/operator-lifecycle-manager/0000_50_olm_02-olm-operator.serviceaccount.yaml diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_02-olmconfig.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_03-olmconfig.yaml similarity index 100% rename from assets/optional/operator-lifecycle-manager/0000_50_olm_02-olmconfig.yaml rename to assets/optional/operator-lifecycle-manager/0000_50_olm_03-olmconfig.yaml diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_02-services.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_03-services.yaml similarity index 100% rename from assets/optional/operator-lifecycle-manager/0000_50_olm_02-services.yaml rename to assets/optional/operator-lifecycle-manager/0000_50_olm_03-services.yaml 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 fb8c8ac329..9ce1c70187 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:b0e21a4ad054307effae29e5974856eaea662c96cbde8a5d5a6e19b70e510537 + digest: sha256:11ea6742994f8b1d4ac2e4f5107485778dc1900cc6a5af962a92f46188019c5f - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:05d9c2f4c91de10e6d763023898653a94d8c4f92187a6e08b70c71459b7253a5 + digest: sha256:3a188fefd8ec1728b67d20ced973fbf4b52a430c2afec32565e5b9238af2f438 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:826a030bfe51515cc56120a0d926a456755b24f6ff46f280aab7762ad4307c8a + digest: sha256:2ef58fdf83c88891683ada248694262383b655301efe01d35435e31caf873f88 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:05d9c2f4c91de10e6d763023898653a94d8c4f92187a6e08b70c71459b7253a5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a188fefd8ec1728b67d20ced973fbf4b52a430c2afec32565e5b9238af2f438 - 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:b0e21a4ad054307effae29e5974856eaea662c96cbde8a5d5a6e19b70e510537 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11ea6742994f8b1d4ac2e4f5107485778dc1900cc6a5af962a92f46188019c5f 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 41c00491e5..cbc50306f5 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:ea70a80449517a6542a91f3cd62286a9d43f51d1c95ea1519def0e18d11e91de + digest: sha256:4e8d9abe504206306a225e61d40305a94b06fe92d2c89940df509cb9a0d99923 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:31ffd9035f95491a78bb6c7bfd7ccb5e31d20435a271f65e9beba58752abdf3f + digest: sha256:b1f94d257f369a705091a15f207269895284cf6be0b6eec8bd50266242b408db - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e2c908e9da2df7a9dd83e23ed6bafcddbbadcb75bca214ecc1866b99ff56b90b + digest: sha256:fd6ebc61171dcbc5bfdb6d83885ae2ca443f83e5b71e0eb3a5cf81e5208061a1 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:31ffd9035f95491a78bb6c7bfd7ccb5e31d20435a271f65e9beba58752abdf3f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f94d257f369a705091a15f207269895284cf6be0b6eec8bd50266242b408db - 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:ea70a80449517a6542a91f3cd62286a9d43f51d1c95ea1519def0e18d11e91de + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e8d9abe504206306a225e61d40305a94b06fe92d2c89940df509cb9a0d99923 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.yaml b/assets/optional/operator-lifecycle-manager/kustomization.yaml index 2147cc0b9c..6738615fc6 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.yaml @@ -10,14 +10,11 @@ resources: - 0000_50_olm_00-operatorgroups.crd.yaml - 0000_50_olm_00-operators.crd.yaml - 0000_50_olm_00-packageserver.pdb.yaml - - 0000_50_olm_00-pprof-config.yaml - - 0000_50_olm_00-pprof-rbac.yaml - - 0000_50_olm_00-pprof-secret.yaml - 0000_50_olm_00-subscriptions.crd.yaml - 0000_50_olm_01-networkpolicies.yaml - - 0000_50_olm_01-olm-operator.serviceaccount.yaml - - 0000_50_olm_02-olmconfig.yaml - - 0000_50_olm_02-services.yaml + - 0000_50_olm_02-olm-operator.serviceaccount.yaml + - 0000_50_olm_03-olmconfig.yaml + - 0000_50_olm_03-services.yaml - 0000_50_olm_07-olm-operator.deployment.yaml - 0000_50_olm_08-catalog-operator.deployment.yaml - 0000_50_olm_09-aggregated.clusterrole.yaml diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 679ed4d6da..02e7ff0675 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.17.0-0.nightly-arm64-2026-02-16-001612" + "base": "4.17.0-0.nightly-arm64-2026-03-02-081840" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0e21a4ad054307effae29e5974856eaea662c96cbde8a5d5a6e19b70e510537", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05d9c2f4c91de10e6d763023898653a94d8c4f92187a6e08b70c71459b7253a5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:826a030bfe51515cc56120a0d926a456755b24f6ff46f280aab7762ad4307c8a" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11ea6742994f8b1d4ac2e4f5107485778dc1900cc6a5af962a92f46188019c5f", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a188fefd8ec1728b67d20ced973fbf4b52a430c2afec32565e5b9238af2f438", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef58fdf83c88891683ada248694262383b655301efe01d35435e31caf873f88" } } 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 77c9b0b85e..9def7a7d91 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.17.0-0.nightly-2026-02-15-171929" + "base": "4.17.0-0.nightly-2026-03-02-093637" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea70a80449517a6542a91f3cd62286a9d43f51d1c95ea1519def0e18d11e91de", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31ffd9035f95491a78bb6c7bfd7ccb5e31d20435a271f65e9beba58752abdf3f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2c908e9da2df7a9dd83e23ed6bafcddbbadcb75bca214ecc1866b99ff56b90b" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e8d9abe504206306a225e61d40305a94b06fe92d2c89940df509cb9a0d99923", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f94d257f369a705091a15f207269895284cf6be0b6eec8bd50266242b408db", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd6ebc61171dcbc5bfdb6d83885ae2ca443f83e5b71e0eb3a5cf81e5208061a1" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 35afc07028..2ccb5a9290 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2026-02-16-001612" + "base": "4.17.0-0.nightly-arm64-2026-03-02-081840" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5063f0958eb7f7b16c1832c9ba25429d66d9eba3eecefc3880a1078ece336b2", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0907a383d6e8f4dff8178dc510a3dbfc0451d4a7532b6933960a9df3f1e88720", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5312ea86efe79cebf387a2cbab7178137076291735f09b2e5595c8757bdc1b88", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:826a030bfe51515cc56120a0d926a456755b24f6ff46f280aab7762ad4307c8a", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76e5692c01d8c29a778cb784628972027c4f478f229812364658134b90de1940", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef32dac94143109646c548bdeb8cdf0e34fd0098343caca02fdeaea2b28669a0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75333c805c72e6a667b7eb5dc4c68bb51892c78b62459ca4d07fe202a7079009", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:599195d5f1e7f465409b2f94a8a5ef46e74e130f487d104e0917042a95a5545f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25771f636a8c0510a6bd07f4d0343b9eb781834809b835eef50134b176b60638", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89f671fbcd8a6d3b39770b0266ff1430bcb3f16278d808859cc81dcf330e8715", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef58fdf83c88891683ada248694262383b655301efe01d35435e31caf873f88", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e98bb6532a05931fc3efd9258b311ae6b40c490faeae57a5964c0d55c184eafa", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d0aa36dcbf1604dd2e7defd28b984ea88571f3c2e87ba4a29a53f29149be37b", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0d39bb5671499a80fc5eca563ad2543b191472caa9327e6fba5f898f963b88d", "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:d33cfdfa5d9fc8e79e245a43df77655532ff80a33ace9cdfe7f0b7aaed2d413c", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0127e5cda95bd545677ef9964e2ac0ffd2a1bd1e9ba79218a94dc8208bd66910" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:595ca36c70d11646609314f9b42dbafb458759621ff46721c4d5665aaafe1070", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5019c4ddf3c11b23a4b1cef67d06198ee0db08530d6442d70e8f7d5643977be6" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 47b284f397..03eaa46c3f 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.17.0-0.nightly-2026-02-15-171929" + "base": "4.17.0-0.nightly-2026-03-02-093637" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3925739eacd2f533cb0a0dac777817b6891c45d5da5fb6aa3a961858b7430e", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d6cb9e1ae887fbd7b35a5d63a1fca9b39dd4301970e4d9b4d3ea8994e4e319", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aad12c4bc679dd1ae11038d1d18e435ad8adff445955370808296ee61f790e64", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2c908e9da2df7a9dd83e23ed6bafcddbbadcb75bca214ecc1866b99ff56b90b", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c3552a7ae899ee257c10fa37c4e999e86640a9d32d1beda882833ba27f0e19c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8886f144ecb570a0ac13b5ad2b850a2083c0884217d34875a6936b045de20b23", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8a77fa59238e6aa589bcd8261c889b99b29afd9991ecbd0b130880a22d1eb36", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a13e875eaef458d32bf61f2b4c38dc50e406479418ec9939d31bfd5d88b3ed72", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46f778c8f6d2d40f98d753222573494b784545a22bd3bc755bb7755094a367e0", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ac180c6fd3bf2ce7f13e15fed365b2016bbde55d43bec77ff2124c3a947dcaa", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd6ebc61171dcbc5bfdb6d83885ae2ca443f83e5b71e0eb3a5cf81e5208061a1", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c7fc45fb3b08400587291ac002b7b1477c3468163b42b9ea1abfb11345da564", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9db6a42902bced46ef198a5f4f90210ca170d4e8fc54e5438ada18246a6f6077", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15c4dbd840a4acb6901b463a131ede713ac63c078b24ac3a5e7c6b1b70525bcd", "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:d4396ad765b185f4d691edb5a8b468c8f799337301a9de40d5fd2111c657d636", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2dc8af04fe35e16da3f5c32fd730b2a494897b74c7a77ab25f55615d6a0094e2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c57b94e339908720464cf8ebb4dfb1d833af700c3def33f80a7f355208a76b1a", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:554e87465b50fba2f6ca99f6a907fcbb56bdcdd550c95da93336fc12edd6467f" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 8d88e25628..4ada7720e5 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:8886f144ecb570a0ac13b5ad2b850a2083c0884217d34875a6936b045de20b23" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9db6a42902bced46ef198a5f4f90210ca170d4e8fc54e5438ada18246a6f6077" 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 ce7547f310..9ec5f3152a 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:ef32dac94143109646c548bdeb8cdf0e34fd0098343caca02fdeaea2b28669a0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d0aa36dcbf1604dd2e7defd28b984ea88571f3c2e87ba4a29a53f29149be37b" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml index 225d13d9a0..69ce2e0dbe 100644 --- a/scripts/auto-rebase/assets.yaml +++ b/scripts/auto-rebase/assets.yaml @@ -230,14 +230,14 @@ assets: - file: 0000_50_olm_00-operatorgroups.crd.yaml - file: 0000_50_olm_00-operators.crd.yaml - file: 0000_50_olm_00-packageserver.pdb.yaml - - file: 0000_50_olm_00-pprof-config.yaml - - file: 0000_50_olm_00-pprof-rbac.yaml - - file: 0000_50_olm_00-pprof-secret.yaml - file: 0000_50_olm_00-subscriptions.crd.yaml - file: 0000_50_olm_01-networkpolicies.yaml - - file: 0000_50_olm_01-olm-operator.serviceaccount.yaml - - file: 0000_50_olm_02-olmconfig.yaml - - file: 0000_50_olm_02-services.yaml + - file: 0000_50_olm_02-olm-operator.serviceaccount.yaml + src: 0000_50_olm_01-olm-operator.serviceaccount.yaml + - file: 0000_50_olm_03-olmconfig.yaml + src: 0000_50_olm_02-olmconfig.yaml + - file: 0000_50_olm_03-services.yaml + src: 0000_50_olm_02-services.yaml - file: 0000_50_olm_07-olm-operator.deployment.yaml - file: 0000_50_olm_08-catalog-operator.deployment.yaml - file: 0000_50_olm_09-aggregated.clusterrole.yaml diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..fdf5376d5d 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,25 @@ +- cluster-kube-apiserver-operator embedded-component 8e391e9a79393c3bcba34c7de63afd3381fb51f3 to 84e19b2149ab818a455b00717d790856c13ea387 + - 6cc667d 2026-02-25T15:55:56Z OCPBUGS-68162: CVE-2025-65637 openshift4/ose-cluster-kube-apiserver-rhel9-operator: github.com/sirupsen/logrus: Denial-of-Service due to large single-line payload [openshift-4.17] + +- machine-config-operator embedded-component 247c2c7ff38913836a0ff6c469e80b82df8cb5a5 to 039f9834a4104785d41d5e10aeaa672492c8dd15 + - 4edc4f0e 2026-02-24T12:12:01-06:00 added mcn conditions to ocl sync + - dd8a517c 2026-02-19T15:05:18-06:00 fix pull secret log spam make verify error + - 3fc58518 2026-02-19T20:51:03Z fixes exposure of sensitive data in log files + - 6f0b00b4 2026-02-05T11:35:21-06:00 PIS + - 1dedbe7a 2026-02-05T11:27:40-06:00 check if the MachineOSConfig CRD exists before starting the informer + - 868a609f 2026-01-20T11:27:09-06:00 WaitForCacheSync blocks forever + +- operator-framework-olm embedded-component 52652d0744d7cf955defb84d38f45bfe640d7850 to e92a5cf8d93f756e47646aaf8f064f656a5f27dd + - aa2ff0b4 2026-02-16T15:40:24Z fixup! Remove the collect-profiles job + - e293a216 2026-02-16T15:40:24Z fixup! Remove the collect-profiles job + - 21d30d28 2026-02-16T15:40:24Z Remove the collect-profiles job + +- service-ca-operator embedded-component 73ca97dd83f69d878cb5059161645f6eb693368a to 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa + - c573cef 2026-02-04T16:49:19-05:00 Update logrus to 1.9.3 to address CVE-2025-65637 + +- service-ca-operator image-amd64 73ca97dd83f69d878cb5059161645f6eb693368a to 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa + - c573cef 2026-02-04T16:49:19-05:00 Update logrus to 1.9.3 to address CVE-2025-65637 + +- service-ca-operator image-arm64 73ca97dd83f69d878cb5059161645f6eb693368a to 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa + - c573cef 2026-02-04T16:49:19-05:00 Update logrus to 1.9.3 to address CVE-2025-65637 + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 23be94baf6..46ce0f2b74 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -2,7 +2,7 @@ https://github.com/openshift/api embedded-component 92c55bf0f372c222dc02f17685c3 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component ffba005bf839897b173cb76d0bb561dcf9c7215c https://github.com/openshift/cluster-dns-operator embedded-component 81507f04686df3e16793b270084ead0a2a67fb38 https://github.com/openshift/cluster-ingress-operator embedded-component 1a164c16e804a4cf4f8b7aca4b8cb24d265dedb4 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8e391e9a79393c3bcba34c7de63afd3381fb51f3 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 84e19b2149ab818a455b00717d790856c13ea387 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component d68b3764db78ad5ca2e61af75f0bc8bcdcf3e644 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 0bb0678bead782461b35d7e8671b3e54b9a46788 https://github.com/openshift/cluster-network-operator embedded-component 1aca832fab45aceebe8026077d67ac6b82b51179 @@ -12,11 +12,11 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 080f6bd https://github.com/openshift/etcd embedded-component 0d9e0a907c4aea7c4b2bff627478785fb99511f5 https://github.com/openshift/kubernetes embedded-component 4e295fa517e17429af4d8004e7a8028fe719e60f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 69b07ae04918806079f1a4fbc2f110453bc8db19 -https://github.com/openshift/machine-config-operator embedded-component 247c2c7ff38913836a0ff6c469e80b82df8cb5a5 +https://github.com/openshift/machine-config-operator embedded-component 039f9834a4104785d41d5e10aeaa672492c8dd15 https://github.com/openshift/openshift-controller-manager embedded-component 967faa66125ae77148df87d8394d07112c4c0b8c -https://github.com/openshift/operator-framework-olm embedded-component 52652d0744d7cf955defb84d38f45bfe640d7850 +https://github.com/openshift/operator-framework-olm embedded-component e92a5cf8d93f756e47646aaf8f064f656a5f27dd https://github.com/openshift/route-controller-manager embedded-component 02bbf80ada3d5acaf36873b1fe69c71badc6d8d7 -https://github.com/openshift/service-ca-operator embedded-component 73ca97dd83f69d878cb5059161645f6eb693368a +https://github.com/openshift/service-ca-operator embedded-component 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa https://github.com/openshift/oc image-amd64 d76df14ea3d7ff9916ea576b6335cd3a220cd1bf https://github.com/openshift/coredns image-amd64 fe89d27d6f2b27baf686c89c4c1c1ceb88fe3567 https://github.com/openshift/csi-external-snapshotter image-amd64 080f6bdb8ffdbfe2556370ce5bc95ac973e1ad95 @@ -25,7 +25,7 @@ https://github.com/openshift/router image-amd64 1e29d8cc87a1c9e6645a4b9aa01197d9 https://github.com/openshift/kube-rbac-proxy image-amd64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-amd64 f1ca69af3bf1d2d4a984579aa11a6a491da706fb https://github.com/openshift/kubernetes image-amd64 4e295fa517e17429af4d8004e7a8028fe719e60f -https://github.com/openshift/service-ca-operator image-amd64 73ca97dd83f69d878cb5059161645f6eb693368a +https://github.com/openshift/service-ca-operator image-amd64 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa https://github.com/openshift/oc image-arm64 d76df14ea3d7ff9916ea576b6335cd3a220cd1bf https://github.com/openshift/coredns image-arm64 fe89d27d6f2b27baf686c89c4c1c1ceb88fe3567 https://github.com/openshift/csi-external-snapshotter image-arm64 080f6bdb8ffdbfe2556370ce5bc95ac973e1ad95 @@ -34,4 +34,4 @@ https://github.com/openshift/router image-arm64 1e29d8cc87a1c9e6645a4b9aa01197d9 https://github.com/openshift/kube-rbac-proxy image-arm64 f708b5ecf87b948864e4f68d0724cda5de13a9d9 https://github.com/openshift/ovn-kubernetes image-arm64 f1ca69af3bf1d2d4a984579aa11a6a491da706fb https://github.com/openshift/kubernetes image-arm64 4e295fa517e17429af4d8004e7a8028fe719e60f -https://github.com/openshift/service-ca-operator image-arm64 73ca97dd83f69d878cb5059161645f6eb693368a +https://github.com/openshift/service-ca-operator image-arm64 2cb0a44d1245cf2f5d7bdf2072484cdfdfa50eaa diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 7280c8691b..45bbee0e7f 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.17.0-0.nightly-2026-02-15-171929" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-02-16-001612" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2026-03-02-093637" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-03-02-081840" diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index b24c14dc68..28fec438f0 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -983,6 +983,17 @@ EOF update_olm_images() { title "Rebasing operator-lifecycle-manager manifests" + # Temporary fix, remove once OCPBUGS-77006 is solved. + local olm_kustomization="${REPOROOT}/assets/optional/operator-lifecycle-manager/kustomization.yaml" + sed -i \ + -e '/0000_50_olm_00-pprof-config\.yaml/d' \ + -e '/0000_50_olm_00-pprof-rbac\.yaml/d' \ + -e '/0000_50_olm_00-pprof-secret\.yaml/d' \ + -e 's/0000_50_olm_01-olm-operator.serviceaccount.yaml/0000_50_olm_02-olm-operator.serviceaccount.yaml/' \ + -e 's/0000_50_olm_02-olmconfig.yaml/0000_50_olm_03-olmconfig.yaml/' \ + -e 's/0000_50_olm_02-services.yaml/0000_50_olm_03-services.yaml/' \ + "${olm_kustomization}" + # Replace hardcoded image refs with variables. Variables will be provided via kustomize's patches (added to `env`). # Expr with --util-image finds line with --util-image and edits the line after. sed -i \