Skip to content

Commit 652b5d3

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-02-14-215306_amd64-2025-02-14_arm64-2025-02-16 (#4562)
* 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 c7cd9a2 commit 652b5d3

23 files changed

+303
-272
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.1
4-
KUBE_GIT_COMMIT=c71f354e5ea84e690c0d34c0e7305b943f64454a
4+
KUBE_GIT_COMMIT=cc907f560ac6272d02cbcc6c97122ef098a85649
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-13-224543
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-16-203317

‎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-11-161912
1+
OCP_VERSION := 4.19.0-0.nightly-2025-02-14-215306

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

‎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-13-224543"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-16-203317"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:498df400bf9d229019292c450f7ec0a9a8ac73c05dab7fd165505e6c672ccd02",

‎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-02-11-161912"
3+
"base": "4.19.0-0.nightly-2025-02-14-215306"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:edc46bb3791fbb58812d8ff53a5bfdf53eba78a64cfa339d86a2805b1f4e3ef0",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed0babb5a8a7966889462799ca4fcd6924099d7cd0f9740727de735327260d1d"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f980a47c06ea793350a0a6a439fb65f3f0f41e2c431f46416540e8be0d2010c",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a32f77a6f12aa8fb4963d998291c6bfa9ec4070946ee044f797d7958d4fea07"
88
}
99
}

‎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:9f24e9460f4d4ba32d277649351e99def00b9c07585fb9f0d678c4f9923a9dbc
5+
digest: sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:39ce208d65a9686ba83884efd949fc7e881ae83c19a2cb6b7efbe1c76c7e9a7d
8+
digest: sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:627a8319364cd61240e7fc45ad1322ddf3a19eacd4657f9e319cbbb9f108f192
11+
digest: sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc
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:39ce208d65a9686ba83884efd949fc7e881ae83c19a2cb6b7efbe1c76c7e9a7d
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093
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:9f24e9460f4d4ba32d277649351e99def00b9c07585fb9f0d678c4f9923a9dbc
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79
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-02-13-224543"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-16-203317"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88df2c7857afadd987ddc302d4587ae12922e3f94e3d9859eb6b2572d4206276",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-02-11-161912"
3+
"base": "4.19.0-0.nightly-2025-02-14-215306"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f24e9460f4d4ba32d277649351e99def00b9c07585fb9f0d678c4f9923a9dbc",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39ce208d65a9686ba83884efd949fc7e881ae83c19a2cb6b7efbe1c76c7e9a7d",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:627a8319364cd61240e7fc45ad1322ddf3a19eacd4657f9e319cbbb9f108f192"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc"
99
}
1010
}

‎assets/release/release-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-02-13-224543"
3+
"base": "4.19.0-0.nightly-arm64-2025-02-16-203317"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d10fa756b4d1c9d553682d852a029e87a17f99a4710c67c1a93863e24d001f1",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87259c9890123980c68fdb91ef253dbc1ed60c85b880934665c41343eb101264",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:511b6ec1692f4bf3a88a820835405a855feee831ceb5d4eb67dd68a21c1ed807",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e985d34f9bcf53de43744e979dc0a06d59a3c138b6649220dff147d80f4fb249",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e31614074e3ef9d16c157869aa370e640a4f6cc1fd7fe85332080ae1cd53f9f",

0 commit comments

Comments
 (0)