Skip to content

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-09-10-095237_amd64-2025-09-10_arm64-2025-09-10 #5450

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

Merged
openshift-merge-bot merged 12 commits into from
Sep 11, 2025
Merged

NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-09-10-095237_amd64-2025-09-10_arm64-2025-09-10 #5450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97f7115
update last_rebase.sh
Sep 11, 2025
ed4b954
update changelog
Sep 11, 2025
76f0037
update microshift/go.mod
Sep 11, 2025
6659f51
update microshift/deps
Sep 11, 2025
686e4b4
update microshift/vendor
Sep 11, 2025
4626663
update deps gofmt
Sep 11, 2025
54fc7cc
update etcd/go.mod
Sep 11, 2025
ab1ba60
update etcd/vendor
Sep 11, 2025
b6cafb8
update component images
Sep 11, 2025
1481bf7
update manifests
Sep 11, 2025
1736314
update buildfiles
Sep 11, 2025
2090f91
update kubernetes version in CNCF scripts
Sep 11, 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
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=33
KUBE_GIT_VERSION=v1.33.3
KUBE_GIT_COMMIT=a237dcbeee8bbe1440c94349399cc6eac8870910
KUBE_GIT_VERSION=v1.33.4
KUBE_GIT_COMMIT=72a1beec012d2552d27d250025c832d7794a7cf1
KUBE_GIT_TREE_STATE=clean
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-09-204939
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-09-10-095236
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-08-182033
OCP_VERSION := 4.20.0-0.nightly-2025-09-10-095237
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.20.0-0.nightly-arm64-2025-09-09-204939"
"base": "4.20.0-0.nightly-arm64-2025-09-10-095236"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c08db6546dfb44593d14b709903d36b5bd4dad53571d5ce57d36040f4d5846e",
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.20.0-0.nightly-2025-09-08-182033"
"base": "4.20.0-0.nightly-2025-09-10-095237"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e717b2a600dca4aa161d89de464d7c376e3d83dd40ad022026eaba9ac7d18410",
Expand Down
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:38381e86f4a95514c6a1ad0fc52c06d685fffa9f0ed210af845c82f0a8fcfdbc
digest: sha256:ebafeea1029975b4cfb0a03c197020bc51ee6019faa2464424534071d972ed5d
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-09-204939"
"base": "4.20.0-0.nightly-arm64-2025-09-10-095236"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b06e7381966986e3c9deaba6fb609ce8377d476bcaa1a68a1bc4360092553f51"
Expand Down
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-08-182033"
"base": "4.20.0-0.nightly-2025-09-10-095237"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38381e86f4a95514c6a1ad0fc52c06d685fffa9f0ed210af845c82f0a8fcfdbc"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebafeea1029975b4cfb0a03c197020bc51ee6019faa2464424534071d972ed5d"
}
}
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:35e75dd28f68f154f7dcf1719a8a8d4baf2d3fc975177b057852ead10b71b7ca
digest: sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5e6732ef4c276e8856e322d124c6bcdba6fa511b97f37f79ac7574978c8a6db3
digest: sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b
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:5e6732ef4c276e8856e322d124c6bcdba6fa511b97f37f79ac7574978c8a6db3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24
- 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:35e75dd28f68f154f7dcf1719a8a8d4baf2d3fc975177b057852ead10b71b7ca
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-09-204939"
"base": "4.20.0-0.nightly-arm64-2025-09-10-095236"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d2f72d59dc08b7be51a9434e97c1a487c4e7ad711bc3e8c7279f246fe7a36aa",
Expand Down
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.20.0-0.nightly-2025-09-08-182033"
"base": "4.20.0-0.nightly-2025-09-10-095237"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e75dd28f68f154f7dcf1719a8a8d4baf2d3fc975177b057852ead10b71b7ca",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e6732ef4c276e8856e322d124c6bcdba6fa511b97f37f79ac7574978c8a6db3",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2025-09-09-204939"
"base": "4.20.0-0.nightly-arm64-2025-09-10-095236"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c16568ba757685e47551d02469a6d2dd772a9998c0a24434865ff43baec952bc",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-09-08-182033"
"base": "4.20.0-0.nightly-2025-09-10-095237"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac8dd579b304458732207221fdc35076520fcf0e58ed82134c00535027f7525",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44014036d295f4fab7e26e16e43625aeb4a6cf2d6db7f656399dacd2e2f45127",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3685c5bd7e78a6b45a5b78710a705fc9e8554aca1c8fbf868998d799b9e153a4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a076b47cde6d55fb97b78c8e69f7eb47f1b916073bade3ae83eee4370b874230",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80eee1a5bc67cc29f2bb1734bbb62c7f73660a83fe18b7946276a5b4f443046d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2a4627c408a4f3acdebfae1b9615a6f6e2b334eea9afcde2bf357bc9efbb0e8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f759c5d90ec8ae62a6bc87f1a3bdfc1c1b36b02f932277c527cdb5999767128",
"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:8fe661da838eb42953c6ad75a62af57c05d729ee63346655ad8c56037faad4b3"
Expand Down
2 changes: 1 addition & 1 deletion deps/github.com/openshift/kubernetes/.go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.4
1.24.5
Loading