Skip to content

Commit fc21adf

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-11-30-172840_amd64-2025-11-30_arm64-2025-12-01 (#5831)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/deps * 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 188d42b commit fc21adf

File tree

69 files changed

+1365
-707
lines changed

Some content is hidden

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

69 files changed

+1365
-707
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.13
4-
KUBE_GIT_COMMIT=337fc64fb1915348588ddee22a04fee0dc6aa083
3+
KUBE_GIT_VERSION=v1.31.14
4+
KUBE_GIT_COMMIT=436b373e7dec669750c65a1ef832665e56b733b7
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-11-27-023819
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-12-01-032311

‎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-11-26-122255
1+
OCP_VERSION := 4.18.0-0.nightly-2025-11-30-172840

‎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:9690737e63dd9ca2aeae04ab5db5fe6d0086c0680da8eff8cee0dc4b72b07429
5+
digest: sha256:f9d86dc5ee44da3eb1b8f73b94538478657fada310d1b8ad33b22860d4da2ef5
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d223d01c06848e7f405578b885bd8b1d3ecf74be4470bf64be5e28705b312b35
8+
digest: sha256:29db4e799a6f9e6c16c90faf73b5249232f2ac35139b4b8acf86ce16611a431b

‎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-11-27-023819"
3+
"base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f56fb6bc797784ddab6d1c3e4009f1654773153102a237ca7dfe06c5bbef6fde",

‎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-11-26-122255"
3+
"base": "4.18.0-0.nightly-2025-11-30-172840"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9690737e63dd9ca2aeae04ab5db5fe6d0086c0680da8eff8cee0dc4b72b07429",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d223d01c06848e7f405578b885bd8b1d3ecf74be4470bf64be5e28705b312b35"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d86dc5ee44da3eb1b8f73b94538478657fada310d1b8ad33b22860d4da2ef5",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29db4e799a6f9e6c16c90faf73b5249232f2ac35139b4b8acf86ce16611a431b"
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:c4ca891d35fd0369bde7cb72c3b3277d8a13c26484d6d1ea7707d324f738e580
5+
digest: sha256:7430023781b2028ab450fb4f805228e25c62df1930d3e2fc1edd9304bc7b5ed1
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:b53b6e2cf8df9318bec72c5901ddb6e5e97ed843c4aeb6b37ec83fe66d1dca44
8+
digest: sha256:1e508520375430acaf9dc2974d17b996af85974c0ca8a47b0a64dc9e4cb9711b
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:a57d87f9610162440c4fc004557d6459b514c8d97ada9f1141accba0a2cdf669
11+
digest: sha256:4638924ee1497d50cf8b85a36a8e980f8da0989b55426cac2068771282ebc232
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:b53b6e2cf8df9318bec72c5901ddb6e5e97ed843c4aeb6b37ec83fe66d1dca44
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e508520375430acaf9dc2974d17b996af85974c0ca8a47b0a64dc9e4cb9711b
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:c4ca891d35fd0369bde7cb72c3b3277d8a13c26484d6d1ea7707d324f738e580
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7430023781b2028ab450fb4f805228e25c62df1930d3e2fc1edd9304bc7b5ed1
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.18.0-0.nightly-arm64-2025-11-27-023819"
3+
"base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc6522dd8dc735a62c846efeb62cf1f0068d2441ebed8ccee3087d77ce0c141",

‎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-11-26-122255"
3+
"base": "4.18.0-0.nightly-2025-11-30-172840"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4ca891d35fd0369bde7cb72c3b3277d8a13c26484d6d1ea7707d324f738e580",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b53b6e2cf8df9318bec72c5901ddb6e5e97ed843c4aeb6b37ec83fe66d1dca44",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a57d87f9610162440c4fc004557d6459b514c8d97ada9f1141accba0a2cdf669"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7430023781b2028ab450fb4f805228e25c62df1930d3e2fc1edd9304bc7b5ed1",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e508520375430acaf9dc2974d17b996af85974c0ca8a47b0a64dc9e4cb9711b",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4638924ee1497d50cf8b85a36a8e980f8da0989b55426cac2068771282ebc232"
99
}
1010
}

‎assets/release/release-aarch64.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-11-27-023819"
3+
"base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:225cf8516a61fa42a40d05627241d76ae23b41e95ad75a783030c3934d98806e",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13eae84e69025e5fbaf2f9b5504bf1919a50fcf253ebf8163658b0bd3ddc565c",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4116ae0b535a46e1ae548ed36bac595f2b0ac7b3e16b195db82eecb040725003",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0cfd92c640f3b981907865d0b6d18542d55b8c6533519d3b78fe580426407f",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64e6e26ad95b9938a5bf1c9809ebee895c40fa9d714bb1ca9e232c259c026970",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:284eaa0f4fad3996a09a3d68fde419c5d1c4a312427acb458ae1caed57245e9a",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33fcd4c023d2bb92d11b3d4ab44e794424604f2e98f3f4ce728f7ddc56b21ad3",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:999fbfdd16e96cbf908360131c842c4ee62aff1bf922fb6ea40be4340c6200e7",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7721cd2753cfc4b78960ad8b9ae0d8727f10011b217e96400ca76f2bb582c2d2"

0 commit comments

Comments
 (0)