Skip to content

NO-ISSUE: rebase-main-4.21.0-0.nightly-2025-09-03-123026_amd64-2025-09-03_arm64-2025-09-03 #5403

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
wants to merge 5 commits into from
Closed

NO-ISSUE: rebase-main-4.21.0-0.nightly-2025-09-03-123026_amd64-2025-09-03_arm64-2025-09-03 #5403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
704b57d
update last_rebase.sh
Sep 5, 2025
7a9d698
update changelog
Sep 5, 2025
c982c68
update component images
Sep 5, 2025
adb42db
update manifests
Sep 5, 2025
c428a27
update buildfiles
Sep 5, 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.20.0-0.nightly-arm64-2025-09-01-210443
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-09-03-060149
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.20.0-0.nightly-2025-09-01-101753
OCP_VERSION := 4.21.0-0.nightly-2025-09-03-123026
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8737e7670cf4be57ac830cfac55a885a6ff36cc1091123d35d695e06b0b6b75f
digest: sha256:dbb67bf1d5c35a018360ebe1439c9cbef0d58d6abbfaaeb2ea6c5e679a005582
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b9ec783e0d56bee2c642ebb6320a5ad1ddae225910136713333f549dd4d25768
digest: sha256:9628d54cec3773d3a20c32509c8d776ccced8e15c3a2b53e8f0084cfc54083cc
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:416f7edbc6d4406eff5e049f817d90033864a29d10b6b93f51de64fe139bd037
digest: sha256:a3dae4b01835811bbc5bdc1c359d572279bc2d3c3e080606eb1aa00f23b36b6c
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:91d80cd3b78a80b10b0354d277101a6d64fed89433b0811cfaa94160440742bd
digest: sha256:912cb4e159a6d9ff0c4803343106155ce2270f5dd2fba129b2ad6bc4c26ba9be
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-01-210443"
"base": "4.21.0-0.nightly-arm64-2025-09-03-060149"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8737e7670cf4be57ac830cfac55a885a6ff36cc1091123d35d695e06b0b6b75f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9ec783e0d56bee2c642ebb6320a5ad1ddae225910136713333f549dd4d25768"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbb67bf1d5c35a018360ebe1439c9cbef0d58d6abbfaaeb2ea6c5e679a005582",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9628d54cec3773d3a20c32509c8d776ccced8e15c3a2b53e8f0084cfc54083cc"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-09-01-101753"
"base": "4.21.0-0.nightly-2025-09-03-123026"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:416f7edbc6d4406eff5e049f817d90033864a29d10b6b93f51de64fe139bd037",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91d80cd3b78a80b10b0354d277101a6d64fed89433b0811cfaa94160440742bd"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3dae4b01835811bbc5bdc1c359d572279bc2d3c3e080606eb1aa00f23b36b6c",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:912cb4e159a6d9ff0c4803343106155ce2270f5dd2fba129b2ad6bc4c26ba9be"
}
}
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
images:
- name: kube-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:aa9c6655aa89198548a407071f2089c800e440cb88756cee525d2bcf29a38be4
digest: sha256:da1932856d873c702aa1f92270794c537eb49c829f75ccc4fbec44bf221701ee
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
images:
- name: kube-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:29d197e8994d8fe3e1ada82916ffc83c1d85e592c648e205b39e2bc38fe0a9cf
digest: sha256:7f0f4679186bef3f2e5f56f22669e751856938704cb234c4709e67430a492b2c
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-01-210443"
"base": "4.21.0-0.nightly-arm64-2025-09-03-060149"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa9c6655aa89198548a407071f2089c800e440cb88756cee525d2bcf29a38be4"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da1932856d873c702aa1f92270794c537eb49c829f75ccc4fbec44bf221701ee"
}
}
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-09-01-101753"
"base": "4.21.0-0.nightly-2025-09-03-123026"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29d197e8994d8fe3e1ada82916ffc83c1d85e592c648e205b39e2bc38fe0a9cf"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f0f4679186bef3f2e5f56f22669e751856938704cb234c4709e67430a492b2c"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3e8c3e8351e7e273a7a8fa6ef073c4c51f39c1db8e97dcbd1e107c61e33a171a
digest: sha256:3d85560ecfe783d43dd39d818372b7052dab4bcc0b261a0e0328fe51ca4c04d0
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:45c01c21e00141d773788579c405528fdb136475e2a725e39e7fdd7196fa2a81
digest: sha256:f23888dd3e2b5db7d017a028e79138febf0216a430a38d6c6f37c2392a7db397
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6dcc5506bd757ca1bded6ef9ca42b2a56eb720f0d1d1f47a48c491673a2a5aa4
digest: sha256:b8f09afbdce32f7b597f5a1f2f8e75f1730919854b6cdbab40ddbbd2cb5e250e

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45c01c21e00141d773788579c405528fdb136475e2a725e39e7fdd7196fa2a81
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23888dd3e2b5db7d017a028e79138febf0216a430a38d6c6f37c2392a7db397
- 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:3e8c3e8351e7e273a7a8fa6ef073c4c51f39c1db8e97dcbd1e107c61e33a171a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d85560ecfe783d43dd39d818372b7052dab4bcc0b261a0e0328fe51ca4c04d0
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d717dce83f4a92a53a2607d623a1640efaba1e838cf9446e33a145e315b796d1
digest: sha256:8e30d769d7e1d87107c702a40ab9ded2a95d7415183f0010de2100a116ae376a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2421a51b40b6a1bd600507e04c24e8c8e870b3092b0dc9c3c9be6d29375e4c4c
digest: sha256:1d3e533dcf8beb8112dd1e04427e122fd1ebb080e7413d13a4c70a19773496c4
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d10dffbb2295f46289fd0de097293133f0d9cb6cd81c0016b7bb1de5dc6e6e59
digest: sha256:931e98dceeb3df51a04414d2e21dc2318468cf137ea785cea90ebc21e962a8bc

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2421a51b40b6a1bd600507e04c24e8c8e870b3092b0dc9c3c9be6d29375e4c4c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d3e533dcf8beb8112dd1e04427e122fd1ebb080e7413d13a4c70a19773496c4
- 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:d717dce83f4a92a53a2607d623a1640efaba1e838cf9446e33a145e315b796d1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e30d769d7e1d87107c702a40ab9ded2a95d7415183f0010de2100a116ae376a
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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.20.0-0.nightly-arm64-2025-09-01-210443"
"base": "4.21.0-0.nightly-arm64-2025-09-03-060149"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e8c3e8351e7e273a7a8fa6ef073c4c51f39c1db8e97dcbd1e107c61e33a171a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45c01c21e00141d773788579c405528fdb136475e2a725e39e7fdd7196fa2a81",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dcc5506bd757ca1bded6ef9ca42b2a56eb720f0d1d1f47a48c491673a2a5aa4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d85560ecfe783d43dd39d818372b7052dab4bcc0b261a0e0328fe51ca4c04d0",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23888dd3e2b5db7d017a028e79138febf0216a430a38d6c6f37c2392a7db397",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8f09afbdce32f7b597f5a1f2f8e75f1730919854b6cdbab40ddbbd2cb5e250e"
}
}
8 changes: 4 additions & 4 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.20.0-0.nightly-2025-09-01-101753"
"base": "4.21.0-0.nightly-2025-09-03-123026"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d717dce83f4a92a53a2607d623a1640efaba1e838cf9446e33a145e315b796d1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2421a51b40b6a1bd600507e04c24e8c8e870b3092b0dc9c3c9be6d29375e4c4c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d10dffbb2295f46289fd0de097293133f0d9cb6cd81c0016b7bb1de5dc6e6e59"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e30d769d7e1d87107c702a40ab9ded2a95d7415183f0010de2100a116ae376a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d3e533dcf8beb8112dd1e04427e122fd1ebb080e7413d13a4c70a19773496c4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:931e98dceeb3df51a04414d2e21dc2318468cf137ea785cea90ebc21e962a8bc"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-01-210443"
"base": "4.21.0-0.nightly-arm64-2025-09-03-060149"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65df57d4a5c54683fa88710f6d3a172a37f0deaa5ded38dd46accdbbc740188d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1343607f9b2a0181bca4042869fe9cac040f343d29b0add4d16c66a4ce25d2d4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c635634de8fa2e193d58fe99acc63416d9916462d710a86db6742e87cabf02c9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dcc5506bd757ca1bded6ef9ca42b2a56eb720f0d1d1f47a48c491673a2a5aa4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8123533d36736a1d3f6b11e060c6a557f8d6995416fc4c86918b8c2ac817cb72",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7c93974ccc75b84c699b7f1ead135226bfe0689689d3f0d1d7d621ed5b5a7ab",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178838fc3cfd7299d32082e423681f9a0bc2ba28a011de52c6e718ead2bc7634",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd180d077df02d86059dd1fe8b585465a147c5a4e87fbcc77ae66d36c74df059",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:946bf072b5a3f471133cd0ecb940545b01ce745919bc8f114ab5bea0c56ddfc6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5ef13e5782adc720451606dfbe93998a5d399d56368ae91de6e0f6a76255d09",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8f09afbdce32f7b597f5a1f2f8e75f1730919854b6cdbab40ddbbd2cb5e250e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b50e4f39e65a95443400d9f976e47ae4cb62dcafb1c7ff03d8110a92b66d55ae",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ff386df17d3dd20871d8b2518a85272196bbdaada24e52f62be10a8352a8b72",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db31b9464cfdc78e3a31909c7bb8bb968543cb36d097de514417d936e9844510",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:291ed630d7551a39b3a720049400bcb8d0d8b3cf0f1a9bfe27358d3f6fe826c5"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f63b6052dcbc4aa335272c2130ccc0f8ab8f4416f37cbd337c5ba8869dc66db"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-09-01-101753"
"base": "4.21.0-0.nightly-2025-09-03-123026"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd68002bffef6ca072019f186f359d6e4474a64e347002441a388cdeac9ce882",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b38dd8938bdf9324a0ace965e77ba8e765cd2f913d674c3b9dc9e53f4934874e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb7ba209de3503d795fec89dadf119779073b289e8c71a9cf6bd01120199d63",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d10dffbb2295f46289fd0de097293133f0d9cb6cd81c0016b7bb1de5dc6e6e59",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9b7e6bbdccc7edaa6682491bdb3e172cc2f7e484920ae690cf60f4b851285de",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6a7df177c6efee91051d9b09f600751b7685855f1791be9a08f777921daaa9d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6e248968976bedbfb4f83d98241d8c97b14ee01261e1018c9aba3c7c68a4219",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce242f166df6bfabf004133e0836e26423fe91d29745a92ec6ec7a5ce4a0f48f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8179e456f9997d91040e389cc492660a9ce99b6daf499b5a6ba3f39f8acc4521",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:821b855561b82a0fbd7574ce22035624f6d73f983c0a989754fa1cea7ff89b57",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:931e98dceeb3df51a04414d2e21dc2318468cf137ea785cea90ebc21e962a8bc",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65c4aecbe2c1f9d279cb6f12308bca285981b5079595e1a3e727c49e6010dedb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07011ded93502dd769a3b4631e8267fcd2115b3f140d0ada093fc8825d827fc5",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15110d60dd57617239bcdfc9c84d93a96d1e5dd96c08dade22c35fc7712d7d4d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2106c18d27a2638dd74d491f0fcfbdd65cf75a1fda337f34e30347f792a2bdb0"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2837392b3143e8a1a9be399b801fc54197eb484057638ddc5c334f5cbb6b8402"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6a7df177c6efee91051d9b09f600751b7685855f1791be9a08f777921daaa9d"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07011ded93502dd769a3b4631e8267fcd2115b3f140d0ada093fc8825d827fc5"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7c93974ccc75b84c699b7f1ead135226bfe0689689d3f0d1d7d621ed5b5a7ab"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ff386df17d3dd20871d8b2518a85272196bbdaada24e52f62be10a8352a8b72"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
9 changes: 6 additions & 3 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
- machine-config-operator embedded-component cc2f713fa75afd493d1abc24cfa965a242ab07bc to 7a56cf0048a05d576e746c3e992ce586e07c97e8
- e516665e 2025-08-28T17:36:33+02:00 OCPBUGS-61016: Fix wait failure on MCO pods
- api embedded-component 4a165b214722ff53fbdac1d250f62d4b0bb2bd3d to a638ff2e96fb9fb41192e85268fdcb07c0b1ed93
- e0349455 2025-09-01T11:30:26+02:00 Add default value for MachineHealthCheck's maxUnhealthy to the description

- oc image-arm64 31597edbaedc6d8d206deda350cfc93e89fa24bf to a43428189603f12ae190703cb725f66f742fbe52
- cluster-network-operator embedded-component 746b8fb86171dfc75011a7b8db29de5c2355d848 to 7bbd2653092fc383803ba98169f6ffc5be2a64d5
- fb3f46d 2025-08-20T14:43:26-05:00 Set RunAsUser for network-node-identity

- oc image-amd64 31597edbaedc6d8d206deda350cfc93e89fa24bf to a43428189603f12ae190703cb725f66f742fbe52
- ea3cacdc 2025-08-29T13:21:45+02:00 must-gather: Fix usage checker for custom commands

6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
https://github.com/openshift/api embedded-component 4a165b214722ff53fbdac1d250f62d4b0bb2bd3d
https://github.com/openshift/api embedded-component a638ff2e96fb9fb41192e85268fdcb07c0b1ed93
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 3880c9659829c9904e58a943050e8dfd4c9a79cb
https://github.com/openshift/cluster-dns-operator embedded-component 82578923164636746e0d74d594ab32d83a660c0b
https://github.com/openshift/cluster-ingress-operator embedded-component 2371120eedb27049160c70859ef9972a7599c7e3
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 0bec046c8c10682390e2a20ae4f416a2d8589f40
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7030e7353408e83096a285404700c573273c25c8
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f9b5b31943f2be768af6373def4c8946a30d0ed6
https://github.com/openshift/cluster-network-operator embedded-component 746b8fb86171dfc75011a7b8db29de5c2355d848
https://github.com/openshift/cluster-network-operator embedded-component 7bbd2653092fc383803ba98169f6ffc5be2a64d5
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component dfaeb8d5fdf1f43df37916ec3d70f57ddebb1028
https://github.com/openshift/cluster-policy-controller embedded-component 3e7538547c8f209c72083097a4ebaada6e9c46c5
https://github.com/openshift/csi-external-snapshotter embedded-component 42604822c25eb2aa0ecb017c24e328221b238eb9
Expand All @@ -17,7 +17,7 @@ https://github.com/openshift/openshift-controller-manager embedded-component 49a
https://github.com/openshift/operator-framework-olm embedded-component e53cf3090214284bf913bd2d7165a0a9422635a0
https://github.com/openshift/route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20
https://github.com/openshift/service-ca-operator embedded-component b0fe556a981964728306f803864af9d2881db967
https://github.com/openshift/oc image-amd64 31597edbaedc6d8d206deda350cfc93e89fa24bf
https://github.com/openshift/oc image-amd64 a43428189603f12ae190703cb725f66f742fbe52
https://github.com/openshift/coredns image-amd64 6f39336e6da9dc77b2db140a96773c413d50a665
https://github.com/openshift/csi-external-snapshotter image-amd64 42604822c25eb2aa0ecb017c24e328221b238eb9
https://github.com/openshift/router image-amd64 7c50294cfbc9a7c0d3c715de56fb92dadeefb8e6
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-09-01-101753" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-09-01-210443"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-09-03-123026" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-09-03-060149"