Skip to content

Commit 8cf902e

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-02-25-035256_amd64-2025-02-25_arm64-2025-02-25 (#4603)
* 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 5367b57 commit 8cf902e

30 files changed

+347
-294
lines changed

Makefile.kube_git.var

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=32
3-
KUBE_GIT_VERSION=v1.32.1
4-
KUBE_GIT_COMMIT=79a6bafe8c66e9d2fe02cd33a45a5d37519de91e
3+
KUBE_GIT_VERSION=v1.32.2
4+
KUBE_GIT_COMMIT=86db063ce6f244acf7d437bda201600d568f9548
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-02-25-005457
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-25-065457

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-02-20-131651
1+
OCP_VERSION := 4.19.0-0.nightly-2025-02-25-035256

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:fe993c8c6ae871819a3dcf62c66945ecd32973724ff51ea3c2b1af89dc787d3e
5+
digest: sha256:e0736e995df08e13ae5c9748651a32060a21f16d395a18231ae2ee7740920839
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:0a32f77a6f12aa8fb4963d998291c6bfa9ec4070946ee044f797d7958d4fea07
8+
digest: sha256:cc81671a9e25456c4fe7a80e0aea3a2be0945053312988c7f409fa14f77db1a4

assets/optional/multus/release-multus-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-02-25-005457"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-25-065457"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b38692fd33a1d658622565a26d9d3f8ca93a6bf0320b8252d2f12cc38bcaca3",
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-02-20-131651"
3+
"base": "4.19.0-0.nightly-2025-02-25-035256"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe993c8c6ae871819a3dcf62c66945ecd32973724ff51ea3c2b1af89dc787d3e",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a32f77a6f12aa8fb4963d998291c6bfa9ec4070946ee044f797d7958d4fea07"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0736e995df08e13ae5c9748651a32060a21f16d395a18231ae2ee7740920839",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc81671a9e25456c4fe7a80e0aea3a2be0945053312988c7f409fa14f77db1a4"
88
}
99
}

assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.0
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

0 commit comments

Comments
 (0)