Skip to content

Commit cb422ad

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-26-070608_amd64-2025-03-26_arm64-2025-03-26 (#4737)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 1697651 commit cb422ad

25 files changed

+422
-321
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=32
33
KUBE_GIT_VERSION=v1.32.3
4-
KUBE_GIT_COMMIT=1601b9e27d8570364d9a1b94be16a0ca7b744a7e
4+
KUBE_GIT_COMMIT=d365efdad4f566821463becaf0d5551a1a5c322f
55
KUBE_GIT_TREE_STATE=clean

‎Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-26-001623
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-26-121623

‎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.19.0-0.nightly-2025-03-21-030708
1+
OCP_VERSION := 4.19.0-0.nightly-2025-03-26-070608

‎assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 1 addition & 1 deletion
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:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb
5+
digest: sha256:95ed448743774ec9d3ba04b595a27eedd584d321e8a27783db11f3291de59142
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
88
digest: sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7

‎assets/optional/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:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05
5+
digest: sha256:38aa521aa0848f5a19c09c9a6d143cab63f0db8b0722ac3bb396648d7fb922b6
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:3b0c01535948b9e6234f08ca5053a121b9480e3fac6e1897eb66c55a91e48a87
8+
digest: sha256:fe8f06d31e1a8812a133626d497d322cf25dd4fea866043a5a2689c39144831d

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-26-001623"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-26-121623"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb",
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95ed448743774ec9d3ba04b595a27eedd584d321e8a27783db11f3291de59142",
77
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7"
88
}
99
}

‎assets/optional/multus/release-multus-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-03-21-030708"
3+
"base": "4.19.0-0.nightly-2025-03-26-070608"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0c01535948b9e6234f08ca5053a121b9480e3fac6e1897eb66c55a91e48a87"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38aa521aa0848f5a19c09c9a6d143cab63f0db8b0722ac3bb396648d7fb922b6",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe8f06d31e1a8812a133626d497d322cf25dd4fea866043a5a2689c39144831d"
88
}
99
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887
5+
digest: sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a
8+
digest: sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea
@@ -16,12 +16,12 @@ patches:
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:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d
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:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-03-26-001623"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-26-121623"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4132023c1e9b8c905dd87b77f45d50139760eb73c9c563ae7a873af5a01679",

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-03-21-030708"
3+
"base": "4.19.0-0.nightly-2025-03-26-070608"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea"
99
}
1010
}

0 commit comments

Comments
 (0)