Skip to content

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-15-083124_amd64-2025-07-15_arm64-2025-07-15 #5201

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 11 commits into from
Jul 16, 2025
Merged

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-15-083124_amd64-2025-07-15_arm64-2025-07-15 #5201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c70aba3
update last_rebase.sh
Jul 16, 2025
6870cc4
update changelog
Jul 16, 2025
26b16d1
update microshift/go.mod
Jul 16, 2025
56683c6
update microshift/deps
Jul 16, 2025
435dd34
update microshift/vendor
Jul 16, 2025
0cfea34
update deps gofmt
Jul 16, 2025
96e2ae4
update etcd/go.mod
Jul 16, 2025
c2f462b
update etcd/vendor
Jul 16, 2025
84a8e01
update component images
Jul 16, 2025
9232803
update manifests
Jul 16, 2025
4aa9234
update buildfiles
Jul 16, 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-07-11-045706
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-15-141336
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-07-07-234740
OCP_VERSION := 4.20.0-0.nightly-2025-07-15-083124
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:cb3f4abb476d27ad964cdc07217391e4a5fd57a05c9454636ad3006e1eecaaf9
digest: sha256:9f5ec7eca07f576a8b2b6015350de810fefd959c6e5b5da9c2e9155620105576
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:05f584448271a522d824046a4cb6112116b437f5e5c791c5cd044bccae2d0906
digest: sha256:de7edb60134fd0b89ebaa34731765c6597a25d7f23602dc38db6acec2bc275ef
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:a8c9f0bf829cfe25367393a9240ccbc8e8e765dcfc80819b939ecf0f714de7c6
digest: sha256:a758cbecd107a66bffcb05fa9d986f5fea887e77fb28f414c1ad2e5cfbb5cfe7
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fc33cd6b92c45f2f4b03247a4d2bf3b1770c49884fb5d7350c9583fa34234c21
digest: sha256:2c7573bf5eff0eba78f5dda4b7b20f796d9e7f618ceb49991d57d446079b62c9
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-07-11-045706"
"base": "4.20.0-0.nightly-arm64-2025-07-15-141336"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb3f4abb476d27ad964cdc07217391e4a5fd57a05c9454636ad3006e1eecaaf9",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05f584448271a522d824046a4cb6112116b437f5e5c791c5cd044bccae2d0906"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f5ec7eca07f576a8b2b6015350de810fefd959c6e5b5da9c2e9155620105576",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de7edb60134fd0b89ebaa34731765c6597a25d7f23602dc38db6acec2bc275ef"
}
}
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-07-07-234740"
"base": "4.20.0-0.nightly-2025-07-15-083124"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8c9f0bf829cfe25367393a9240ccbc8e8e765dcfc80819b939ecf0f714de7c6",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc33cd6b92c45f2f4b03247a4d2bf3b1770c49884fb5d7350c9583fa34234c21"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a758cbecd107a66bffcb05fa9d986f5fea887e77fb28f414c1ad2e5cfbb5cfe7",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c7573bf5eff0eba78f5dda4b7b20f796d9e7f618ceb49991d57d446079b62c9"
}
}
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:6833d81b94fd3c7452de5002f3ee3e7a0a02ac02dd87c173e97bfc8888af6d8d
digest: sha256:e7e057c72f000725c348dd742284a558745e4928fe4d894c88bac677ff7c7811
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:27f736d5d1b1b7e70ecc1de48dcf5784715237127410a3d99d4cab3d54cf1714
digest: sha256:2bda152d262a81dd1a722078fd7a691336fe1d746e33720c68cee2e16194ba94
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-07-11-045706"
"base": "4.20.0-0.nightly-arm64-2025-07-15-141336"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6833d81b94fd3c7452de5002f3ee3e7a0a02ac02dd87c173e97bfc8888af6d8d"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7e057c72f000725c348dd742284a558745e4928fe4d894c88bac677ff7c7811"
}
}
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-07-07-234740"
"base": "4.20.0-0.nightly-2025-07-15-083124"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f736d5d1b1b7e70ecc1de48dcf5784715237127410a3d99d4cab3d54cf1714"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bda152d262a81dd1a722078fd7a691336fe1d746e33720c68cee2e16194ba94"
}
}
10 changes: 1 addition & 9 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.17.2
controller-gen.kubebuilder.io/version: v0.18.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 @@ -367,7 +367,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand All @@ -382,7 +381,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand Down Expand Up @@ -539,7 +537,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand All @@ -554,7 +551,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand Down Expand Up @@ -712,7 +708,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand All @@ -727,7 +722,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand Down Expand Up @@ -884,7 +878,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
Also, matchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand All @@ -899,7 +892,6 @@ spec:
pod labels will be ignored. The default value is empty.
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
type: array
items:
type: string
Expand Down
Loading