Skip to content

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-28-153905_amd64-2025-07-28_arm64-2025-07-28 #5265

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
merged 14 commits into from
Jul 29, 2025
Merged

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-28-153905_amd64-2025-07-28_arm64-2025-07-28 #5265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
afbc0d9
remove router controller manager patch
pacevedom Jul 29, 2025
38be8e5
remove cluster policy controller patch
pacevedom Jul 29, 2025
445fcf2
remove rcm and cpc from deps
pacevedom Jul 29, 2025
44d5a3b
update last_rebase.sh
pacevedom Jul 29, 2025
d2dbc29
update changelog
pacevedom Jul 29, 2025
628ccb7
update microshift/go.mod
pacevedom Jul 29, 2025
322e422
update microshift/deps
pacevedom Jul 29, 2025
5239add
update microshift/vendor
pacevedom Jul 29, 2025
01dad8f
update deps gofmt
pacevedom Jul 29, 2025
66446fd
update etcd/go.mod
pacevedom Jul 29, 2025
f3a810d
update etcd/vendor
pacevedom Jul 29, 2025
979e8b5
update manifests
pacevedom Jul 29, 2025
06a90ff
update buildfiles
pacevedom Jul 29, 2025
d371ca2
remove deps for cpc and rcm
pacevedom Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
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-27-220022
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-28-220022
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-23-175936
OCP_VERSION := 4.20.0-0.nightly-2025-07-28-153905
2 changes: 1 addition & 1 deletion assets/components/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ images:
digest: sha256:679d89634d5460078f42f7b5ec1d1faf36212d731fcc0f8ef7cf0e4182f15dd5
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:26de6d90df58d27d562c8198b2380f80178e9a6bb84f9266612598d32e21c223
digest: sha256:876ed22c4ea0a972e1419bb431eec671a08e997c923e88b27f5c795737eacc82
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-07-27-220022"
"base": "4.20.0-0.nightly-arm64-2025-07-28-220022"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15d2d5ca16f9957ca49e57fde1ad58642d396cfeb1979a79b4b0f806916dc02d",
Expand Down
4 changes: 2 additions & 2 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-23-175936"
"base": "4.20.0-0.nightly-2025-07-28-153905"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:679d89634d5460078f42f7b5ec1d1faf36212d731fcc0f8ef7cf0e4182f15dd5",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26de6d90df58d27d562c8198b2380f80178e9a6bb84f9266612598d32e21c223"
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:876ed22c4ea0a972e1419bb431eec671a08e997c923e88b27f5c795737eacc82"
}
}
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-07-27-220022"
"base": "4.20.0-0.nightly-arm64-2025-07-28-220022"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48ec8f93baa7715ec1b15a06704c99a17101274b2ca290c78ba034404b2c24a5"
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-07-23-175936"
"base": "4.20.0-0.nightly-2025-07-28-153905"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20911c38cbddd02ac8cbd0321fea3f63b901187fc5f3f3a4b52b1dd3554becba"
Expand Down
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:61413b6ed1f5bce891bbe0e7082f3f580e8479b7ba8d7e90afba99dadacd05c9
digest: sha256:af6b4a1dfd530ebf8edbdee9ddb6ee16dc8bbd0cafc29fc61bd77eab26ce7f79
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:11a0f4ad9822f72a1b2da01a9ab836bbfa8251935966f9609fd65621c2e03a7f
digest: sha256:ba253f3f16975698b312fbadf00736583f1fdb2e2c8bda64dbfc2ff112243ddc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:604106cedeb5fb6c9a32398986fb9c134109dc37d7b23b3f179edb80a82701ea
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:11a0f4ad9822f72a1b2da01a9ab836bbfa8251935966f9609fd65621c2e03a7f
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba253f3f16975698b312fbadf00736583f1fdb2e2c8bda64dbfc2ff112243ddc
- 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:61413b6ed1f5bce891bbe0e7082f3f580e8479b7ba8d7e90afba99dadacd05c9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af6b4a1dfd530ebf8edbdee9ddb6ee16dc8bbd0cafc29fc61bd77eab26ce7f79
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-07-27-220022"
"base": "4.20.0-0.nightly-arm64-2025-07-28-220022"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9547c727a35a84a7ae690a91ea4fc62017a6e3b957dc2235b59d1084cf8924e1",
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-07-23-175936"
"base": "4.20.0-0.nightly-2025-07-28-153905"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61413b6ed1f5bce891bbe0e7082f3f580e8479b7ba8d7e90afba99dadacd05c9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11a0f4ad9822f72a1b2da01a9ab836bbfa8251935966f9609fd65621c2e03a7f",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af6b4a1dfd530ebf8edbdee9ddb6ee16dc8bbd0cafc29fc61bd77eab26ce7f79",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba253f3f16975698b312fbadf00736583f1fdb2e2c8bda64dbfc2ff112243ddc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:604106cedeb5fb6c9a32398986fb9c134109dc37d7b23b3f179edb80a82701ea"
}
}
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-07-27-220022"
"base": "4.20.0-0.nightly-arm64-2025-07-28-220022"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25956c0c5c22274dadbc6d908f8eb6f5690ad251908c8d095b965d49ce8f1140",
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,13 +1,13 @@
{
"release": {
"base": "4.20.0-0.nightly-2025-07-23-175936"
"base": "4.20.0-0.nightly-2025-07-28-153905"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4e7e69913585f1499dfc8731ff0a1b7fc809e9b169a7e77275736ae65025fdc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3513d0db06fb77d7676df7e327601dce5584b1a1dfabe67299ed41944f45ac98",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16c4bd0e9bab87aac232af63ab8899f259676c468da25bfac74eb9693206bc2e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:604106cedeb5fb6c9a32398986fb9c134109dc37d7b23b3f179edb80a82701ea",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a502e2c8522098931008408996f0800ae646f1bc03be1fbdbe6203f89401d8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25d0b846abbf5db874484169a06b496ad57016517e4c119e8491983fc9a2f532",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4c025e77df39dbc5a98f1f9f262b8f5b4cb991448b484be497f6fe3189fb1b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:002c67fa8b31fd505d3641537c54a3e6de84c91c68363f3faef64b596b5a3b83",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc",
Expand Down
4 changes: 0 additions & 4 deletions deps/github.com/openshift/cluster-policy-controller/.ci-operator.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions deps/github.com/openshift/cluster-policy-controller/.gitignore
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions deps/github.com/openshift/cluster-policy-controller/.snyk
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions deps/github.com/openshift/cluster-policy-controller/Dockerfile.rhel
View file
Open in desktop

This file was deleted.

201 changes: 0 additions & 201 deletions deps/github.com/openshift/cluster-policy-controller/LICENSE
View file
Open in desktop

This file was deleted.

Loading