Skip to content

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2025-10-27-085201_amd64-2025-10-27_arm64-2025-10-27 #5670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2025-10-27-085201_amd64-2025-10-27_arm64-2025-10-27 #5670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecfd5c7
update last_rebase.sh
Oct 28, 2025
b9a9a1b
update changelog
Oct 28, 2025
a320b61
update manifests
Oct 28, 2025
47035b0
update buildfiles
Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-10-22-190453
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-10-27-064101
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.21.0-0.nightly-2025-10-22-123727
OCP_VERSION := 4.21.0-0.nightly-2025-10-27-085201
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-10-22-190453"
"base": "4.21.0-0.nightly-arm64-2025-10-27-064101"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:946cf47f49872d9ab2a6a764eb78f1ae5c7ac6fe8822d8e7d76fc2f0823220df",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-10-22-123727"
"base": "4.21.0-0.nightly-2025-10-27-085201"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9911528df809594adb3387f01e19d8f3c638744ccef5d8cd888b01e4f42c0d93",
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down Expand Up @@ -635,8 +635,8 @@ spec:
most preferred is the one with the greatest sum of weights, i.e.
for each node that meets all of the scheduling requirements (resource
request, requiredDuringScheduling anti-affinity expressions, etc.),
compute a sum by iterating through the elements of this field and adding
"weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
compute a sum by iterating through the elements of this field and subtracting
"weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
node(s) with the highest sum are the most preferred.
type: array
items:
Expand Down
458 changes: 418 additions & 40 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.18.0
controller-gen.kubebuilder.io/version: v0.19.0
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
172 changes: 155 additions & 17 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_02-olm-operator.serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@ rules:
verbs: ["watch", "list", "get", "create", "update", "patch", "delete", "deletecollection", "escalate", "bind"]
- nonResourceURLs: ["*"]
verbs: ["*"]
- apiGroups:
- authentication.k8s.io
resources:
- tokenreviews
verbs:
- create
- apiGroups:
- authorization.k8s.io
resources:
- subjectaccessreviews
verbs:
- create
- apiGroups:
- security.openshift.io
resources:
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
secretName: olm-operator-serving-cert
- name: profile-collector-cert
secret:
secretName: pprof-cert
secretName: olm-operator-serving-cert
- name: tmpfs
emptyDir: {}
containers:
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
secretName: catalog-operator-serving-cert
- name: profile-collector-cert
secret:
secretName: pprof-cert
secretName: catalog-operator-serving-cert
- name: tmpfs
emptyDir: {}
containers:
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:675ab2f26ccb0b60971b102429fc8ff448231b1dfa4c7d6b745cc183d8d843f4
digest: sha256:5289d54d6a6e45835273b88d9ada86f4494e1e73ff0ba7472cba90caac9bbbd3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:82ae682ebab11368ea3ca6b82f3a79b492ee990aacc9e762d3e3a59916b6f421
digest: sha256:6223f2deebd9c3fe13de8f5b7616803f48902b2f4a7da53b824c44065c831beb
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e23547bdd86a1dff7b18777373ed30f9912809bb1405ae1efda402f24cf58d34
Expand All @@ -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:82ae682ebab11368ea3ca6b82f3a79b492ee990aacc9e762d3e3a59916b6f421
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6223f2deebd9c3fe13de8f5b7616803f48902b2f4a7da53b824c44065c831beb
- 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:675ab2f26ccb0b60971b102429fc8ff448231b1dfa4c7d6b745cc183d8d843f4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5289d54d6a6e45835273b88d9ada86f4494e1e73ff0ba7472cba90caac9bbbd3
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f0d90fa6e41d021e34e5316caf8744c2f100179aca18ec1e1b68fe7ebbe43aa4
digest: sha256:3063999ff44535a069c880fc97674d7f427bd7def3b2105373c5136dd2f3f02a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3af384fc22c6d12b5579cc908adf0f5ce69f3f5645a78f4ae3f1bea94f53cc95
digest: sha256:7163356a108a704d079cfc68be0ede80017654e6c0c73617f8bda5d447e5ae18
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d
Expand All @@ -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:3af384fc22c6d12b5579cc908adf0f5ce69f3f5645a78f4ae3f1bea94f53cc95
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7163356a108a704d079cfc68be0ede80017654e6c0c73617f8bda5d447e5ae18
- 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:f0d90fa6e41d021e34e5316caf8744c2f100179aca18ec1e1b68fe7ebbe43aa4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3063999ff44535a069c880fc97674d7f427bd7def3b2105373c5136dd2f3f02a
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-10-22-190453"
"base": "4.21.0-0.nightly-arm64-2025-10-27-064101"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:675ab2f26ccb0b60971b102429fc8ff448231b1dfa4c7d6b745cc183d8d843f4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82ae682ebab11368ea3ca6b82f3a79b492ee990aacc9e762d3e3a59916b6f421",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5289d54d6a6e45835273b88d9ada86f4494e1e73ff0ba7472cba90caac9bbbd3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6223f2deebd9c3fe13de8f5b7616803f48902b2f4a7da53b824c44065c831beb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e23547bdd86a1dff7b18777373ed30f9912809bb1405ae1efda402f24cf58d34"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-10-22-123727"
"base": "4.21.0-0.nightly-2025-10-27-085201"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0d90fa6e41d021e34e5316caf8744c2f100179aca18ec1e1b68fe7ebbe43aa4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3af384fc22c6d12b5579cc908adf0f5ce69f3f5645a78f4ae3f1bea94f53cc95",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3063999ff44535a069c880fc97674d7f427bd7def3b2105373c5136dd2f3f02a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7163356a108a704d079cfc68be0ede80017654e6c0c73617f8bda5d447e5ae18",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d"
}
}
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-10-22-190453"
"base": "4.21.0-0.nightly-arm64-2025-10-27-064101"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2d5aef83e6593010c8c7f5c109cc50c7533b0e17d6d7efc569dee973f55c217",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3594e7a15bb3f5cc802e29fdc8e525c67418dff144150fb4ba0a41863bef738",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3f640a67eab56e0efcc548b63f5222df9cd3ee667d909f46667f49443bf1724",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7b2278ba99bd192d57fe7b1820d47e2ace732670dfa63e4ed0fd2a2de52785f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e23547bdd86a1dff7b18777373ed30f9912809bb1405ae1efda402f24cf58d34",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a9e1e2dff0b52b366036024ecaff25903baab14b03a6b9daba74f6dc9b66441",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a637267f6e2a065d101e1b83b0461a0f5e84f043c52113f2c1f40145f8d92f00",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7c72ef1887f087f42100c06991c22fd7d2c12cac7bdc6178e831157af76fe5b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da8665e8c39870474a0c74ca9b1921485ef1ae4f7938ec23ba241a9c78bc3629",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8150adb311effa478bff39ac25f6eadfba9db12aa09669e048dbbc1d6fd67cba",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcb366668e4476783e973250c5056a575f5581926f1168c6164580977139ca05"
}
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-10-22-123727"
"base": "4.21.0-0.nightly-2025-10-27-085201"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32fc8d00b3f473d083d2ae82b63af087e7526d9ae941de388fb31f40a85522e3",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:491b7215b2ffbdeba1fed69677c0955dc653d109c0ec55f9b980597842d1654c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d880ec2bc1f2e70d60c1fc91af0fedb8ff2ee5261ead5356efa60c95d3ee5d6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:086b4263895663cbc94544e41ac197ee96ba661379a498733e1f65f5ce53f1c8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad19c1f0010ebcda83c0f0e9f0b2618f0ccd4353388c8ce668c036a153dc70ab",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e7fe983fc4505fa729372f2dc0c6b39504fe853f7f0846204467c957fff639c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:001da71234c34cc1a0f6b7e8a20de88a2277a71787d0b8c04d80722e9e146af9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524ab36ed6dcf33c49ee2929e1fd138817373b4b3231c36139b05a3daec4d77d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a6892c392d86391d9628f5b5ce6e58bafdf6a3d6da6f7b5ea581ed173c8cccc",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:716e6e57400be2b54fb0ff785b20211730b0d4fb6af4ee0510925c5bfaf66103"
}
Expand Down
Loading