Skip to content

Commit f94b6db

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-09-27-231748_amd64-2025-09-27_arm64-2025-09-28 (#5533)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/deps * update microshift/vendor * update deps gofmt * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 8860965 commit f94b6db

File tree

42 files changed

+667
-250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+667
-250
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=31
3-
KUBE_GIT_VERSION=v1.31.12
4-
KUBE_GIT_COMMIT=a06f3261941734178f3c43db62a80cc5fc97f7ad
3+
KUBE_GIT_VERSION=v1.31.13
4+
KUBE_GIT_COMMIT=e2e5d628ce43695982002737a4d1f1c6eb30eb11
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.18.0-0.nightly-arm64-2025-09-24-234650
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-09-28-022740

‎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.18.0-0.nightly-2025-09-22-073504
1+
OCP_VERSION := 4.18.0-0.nightly-2025-09-27-231748

‎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:250b8aad6abb6a8183965027d7aa41db85f869913bb741eef2cbff0df325f8f3
5+
digest: sha256:bed28d0c0111b591907ed1903636b3f9e98476ec4b2c19c3366cc36e8c5d600a
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:78b4bb22b7258272eb51a5c2f91dffdc521d55121134a76a60e871e8f73e7878
8+
digest: sha256:9ecd4bc57d3130fdbd8c8072c51adf2d29c5d2fa684e3781f5b71e4525c7db96

‎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.18.0-0.nightly-arm64-2025-09-24-234650"
3+
"base": "4.18.0-0.nightly-arm64-2025-09-28-022740"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29a44498c840a16e028f7e68d35430b6f8cd01b9e52a5a92a6c315cc330e9985",

‎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.18.0-0.nightly-2025-09-22-073504"
3+
"base": "4.18.0-0.nightly-2025-09-27-231748"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:250b8aad6abb6a8183965027d7aa41db85f869913bb741eef2cbff0df325f8f3",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78b4bb22b7258272eb51a5c2f91dffdc521d55121134a76a60e871e8f73e7878"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed28d0c0111b591907ed1903636b3f9e98476ec4b2c19c3366cc36e8c5d600a",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ecd4bc57d3130fdbd8c8072c51adf2d29c5d2fa684e3781f5b71e4525c7db96"
88
}
99
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:7606802424c73afd0b62b60bbafc19470a4579310d6cdb39c2a5b19ff4860fb2
5+
digest: sha256:cf60f1fe3cda5725ff39864ab15167fb647f4148e941ce094d0257d02c46381d
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
88
digest: sha256:1c128acddf88d49b8fcb65d127d342c535056efeb73ea13d5f8dbdb2bb2d0830
@@ -21,7 +21,7 @@ patches:
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:7606802424c73afd0b62b60bbafc19470a4579310d6cdb39c2a5b19ff4860fb2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf60f1fe3cda5725ff39864ab15167fb647f4148e941ce094d0257d02c46381d
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎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:15d219bb42af0d755421e6c339bdaa521eef411678501059ad49d771f16d844c
5+
digest: sha256:9542862c74d2cddbf6f10a9f967595436c1fc5b05169969baf558a37a425a868
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1c4ae38891622f02fdf6e2cd8cc08702bbac2c015a4cd652badb88ec2618bc00
8+
digest: sha256:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:b6f5d23830c7c2ad70de24a2537e78876b3e1749a3d7bacc339311e9b7c447d0
11+
digest: sha256:f22b65e5c744a32d3955dd7c36d809e3114a8aa501b44c00330dfda886c21169
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:1c4ae38891622f02fdf6e2cd8cc08702bbac2c015a4cd652badb88ec2618bc00
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5
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:15d219bb42af0d755421e6c339bdaa521eef411678501059ad49d771f16d844c
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542862c74d2cddbf6f10a9f967595436c1fc5b05169969baf558a37a425a868
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-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.18.0-0.nightly-arm64-2025-09-24-234650"
3+
"base": "4.18.0-0.nightly-arm64-2025-09-28-022740"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7606802424c73afd0b62b60bbafc19470a4579310d6cdb39c2a5b19ff4860fb2",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf60f1fe3cda5725ff39864ab15167fb647f4148e941ce094d0257d02c46381d",
77
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c128acddf88d49b8fcb65d127d342c535056efeb73ea13d5f8dbdb2bb2d0830",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5649e151f092113dece6884654f08760e7245a324e40a289bb695b68f6838631"
99
}

‎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.18.0-0.nightly-2025-09-22-073504"
3+
"base": "4.18.0-0.nightly-2025-09-27-231748"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15d219bb42af0d755421e6c339bdaa521eef411678501059ad49d771f16d844c",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c4ae38891622f02fdf6e2cd8cc08702bbac2c015a4cd652badb88ec2618bc00",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6f5d23830c7c2ad70de24a2537e78876b3e1749a3d7bacc339311e9b7c447d0"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542862c74d2cddbf6f10a9f967595436c1fc5b05169969baf558a37a425a868",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f22b65e5c744a32d3955dd7c36d809e3114a8aa501b44c00330dfda886c21169"
99
}
1010
}

0 commit comments

Comments
 (0)