Skip to content

Commit 28c363a

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2025-09-14-060615_amd64-2025-09-14_arm64-2025-09-11 (#5465)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 61cee05 commit 28c363a

File tree

13 files changed

+52
-36
lines changed

13 files changed

+52
-36
lines changed

Makefile.kube_git.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=33
33
KUBE_GIT_VERSION=v1.33.4
4-
KUBE_GIT_COMMIT=72a1beec012d2552d27d250025c832d7794a7cf1
4+
KUBE_GIT_COMMIT=633ffc1ea74728b2a5bbc07c450b5a4a90d5790e
55
KUBE_GIT_TREE_STATE=clean

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.20.0-0.nightly-2025-09-10-095237
1+
OCP_VERSION := 4.20.0-0.nightly-2025-09-14-060615

assets/components/multus/kustomization.x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:e717b2a600dca4aa161d89de464d7c376e3d83dd40ad022026eaba9ac7d18410
5+
digest: sha256:f5ee71eec9bf035314ea964721b222af896254fdf755a0b30ab6622b7788d35b
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:ac19b6d6f943714cf5a51b3999539e2e4d6280ad870122a42f9dd4b8d10bfd40
8+
digest: sha256:ed116d36bc29efac9e61fd8d94708ae896fd8a95d0f2472c62c38ad6ebce666d
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-09-10-095237"
3+
"base": "4.20.0-0.nightly-2025-09-14-060615"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e717b2a600dca4aa161d89de464d7c376e3d83dd40ad022026eaba9ac7d18410",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac19b6d6f943714cf5a51b3999539e2e4d6280ad870122a42f9dd4b8d10bfd40"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5ee71eec9bf035314ea964721b222af896254fdf755a0b30ab6622b7788d35b",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed116d36bc29efac9e61fd8d94708ae896fd8a95d0f2472c62c38ad6ebce666d"
88
}
99
}

assets/optional/kube-proxy/kustomization.x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
images:
33
- name: kube-proxy
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:ebafeea1029975b4cfb0a03c197020bc51ee6019faa2464424534071d972ed5d
5+
digest: sha256:20f1ca8387757b8ba13cf7313ec0c4af119b8b6a57f827a3685ff219109fb9ff
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-09-10-095237"
3+
"base": "4.20.0-0.nightly-2025-09-14-060615"
44
},
55
"images": {
6-
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebafeea1029975b4cfb0a03c197020bc51ee6019faa2464424534071d972ed5d"
6+
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20f1ca8387757b8ba13cf7313ec0c4af119b8b6a57f827a3685ff219109fb9ff"
77
}
88
}

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233
5+
digest: sha256:b428d8e13f2bb99152dd18b481c954494d6390b3525b9d722ae7d0c3e415e2a6
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24
8+
digest: sha256:c2e7614f79a565e1c194ec370e94e3d9dab0e03d87c3de3db2b06436f1985f5e
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b
11+
digest: sha256:176fd01265f3cf5e6dff95cb22498af8061fccbab91b96cddf05a00c83743126
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2e7614f79a565e1c194ec370e94e3d9dab0e03d87c3de3db2b06436f1985f5e
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b428d8e13f2bb99152dd18b481c954494d6390b3525b9d722ae7d0c3e415e2a6
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-09-10-095237"
3+
"base": "4.20.0-0.nightly-2025-09-14-060615"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3cadbe2c3515542c0256275396735ee542b0c6f2634eef3fd22d2f695634233",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a40275cedf2fb5b6b0cf749cbe408a1ad1c360de33076e2794895418a2550a24",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b428d8e13f2bb99152dd18b481c954494d6390b3525b9d722ae7d0c3e415e2a6",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2e7614f79a565e1c194ec370e94e3d9dab0e03d87c3de3db2b06436f1985f5e",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:176fd01265f3cf5e6dff95cb22498af8061fccbab91b96cddf05a00c83743126"
99
}
1010
}

assets/release/release-x86_64.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-09-10-095237"
3+
"base": "4.20.0-0.nightly-2025-09-14-060615"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac8dd579b304458732207221fdc35076520fcf0e58ed82134c00535027f7525",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44014036d295f4fab7e26e16e43625aeb4a6cf2d6db7f656399dacd2e2f45127",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3685c5bd7e78a6b45a5b78710a705fc9e8554aca1c8fbf868998d799b9e153a4",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d4b12e44cdd7111bf136d3f72240cd46285d0294778896c43d98b6dd4fb563b",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a076b47cde6d55fb97b78c8e69f7eb47f1b916073bade3ae83eee4370b874230",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2a4627c408a4f3acdebfae1b9615a6f6e2b334eea9afcde2bf357bc9efbb0e8",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f759c5d90ec8ae62a6bc87f1a3bdfc1c1b36b02f932277c527cdb5999767128",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bfdfdc17534fd5c09797cb1847205e7c36ee7e2fbe52f5b7cee44988e9ac71f",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e32894611ced1238f930af4848f6ce7a48570fff2dff0409cd8555b7b7a2514",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c4e4aa773ba2b8ee099ba17e483990e36e51fbecce815df7de960793ab78b57",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:176fd01265f3cf5e6dff95cb22498af8061fccbab91b96cddf05a00c83743126",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ea7fd542617ca445022127282cdc247be7a604bb747c71754b77e0cebc5c324",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4cb59cfaa4ec94d4313d09edfd604f0669f6a3d5a003bc2367a30c23aa2dbe5",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82c3e9b9252490fcb6680c0797c1ac9658f1d4e81164c2d9d7f7e135fb6658bd",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fe661da838eb42953c6ad75a62af57c05d729ee63346655ad8c56037faad4b3"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba0ba30caadb166b6532cdf4f25ec095fb81df4ff0409e1f2eeedbe743ef767e"
1515
}
1616
}

packaging/crio.conf.d/10-microshift_amd64.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# for community builds on top of OKD, this setting has no effect
33
[crio.image]
44
global_auth_file="/etc/crio/openshift-pull-secret"
5-
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2a4627c408a4f3acdebfae1b9615a6f6e2b334eea9afcde2bf357bc9efbb0e8"
5+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4cb59cfaa4ec94d4313d09edfd604f0669f6a3d5a003bc2367a30c23aa2dbe5"
66
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
77
pause_command = "/usr/bin/pod"

0 commit comments

Comments
 (0)