Skip to content

Commit b0969b5

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-01-19-085729_amd64-2026-01-19_arm64-2026-01-20 (#6109)
* update last_rebase.sh * update changelog * update microshift/deps * update microshift/vendor * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent dc384b1 commit b0969b5

File tree

20 files changed

+198
-78
lines changed

20 files changed

+198
-78
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=34
33
KUBE_GIT_VERSION=v1.34.2
4-
KUBE_GIT_COMMIT=581cfc7ee3313c212378878350aec16236e3f155
4+
KUBE_GIT_COMMIT=e4a4167c40c9ed543c5a80f2e08cc73696f7a4f6
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.22.0-0.nightly-arm64-2026-01-19-012506
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-20-012506

‎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.22.0-0.nightly-2026-01-14-031657
1+
OCP_VERSION := 4.22.0-0.nightly-2026-01-19-085729

‎assets/components/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:c13ad07fc7ce0dbc3feac025968f7293d847be375e04a68661c758dffd69fd27
5+
digest: sha256:d5681448fa84858ee167bc469513ada37d36609c097fc9299cd43dae27981ce0
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:f51abd304c94265dea2a6850e737ef74d022a565781c794c05deff9b2655e9c2
8+
digest: sha256:86db028cae93ae247d2c0b360a6c18813ab852f154a287b4e0178ee282756f07

‎assets/components/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.22.0-0.nightly-arm64-2026-01-19-012506"
3+
"base": "4.22.0-0.nightly-arm64-2026-01-20-012506"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93b83310a1d41625739faad63c02f7fca2d28c2bf1e611ff73a96cda675c6db",

‎assets/components/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.22.0-0.nightly-2026-01-14-031657"
3+
"base": "4.22.0-0.nightly-2026-01-19-085729"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c13ad07fc7ce0dbc3feac025968f7293d847be375e04a68661c758dffd69fd27",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f51abd304c94265dea2a6850e737ef74d022a565781c794c05deff9b2655e9c2"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5681448fa84858ee167bc469513ada37d36609c097fc9299cd43dae27981ce0",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86db028cae93ae247d2c0b360a6c18813ab852f154a287b4e0178ee282756f07"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73
5+
digest: sha256:dfc002be07174090a7d1d671eec55d01f4694d7b8dbba80dbacd9e922c357aa3
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e
8+
digest: sha256:7bddb2494726b7421e89d6167cb699a57f7ba43caed02e46a54b9fd903e94aa0
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:eda70ca394fd8960fa0befd53948e8be7d66acc54127ee3eaf05af57ee85655e
@@ -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:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bddb2494726b7421e89d6167cb699a57f7ba43caed02e46a54b9fd903e94aa0
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:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dfc002be07174090a7d1d671eec55d01f4694d7b8dbba80dbacd9e922c357aa3
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:3694a2caa57aabc0883a7b4ca9c5e52afd7a9ea3c81da93c0b1e490d7ac8c5fa
5+
digest: sha256:8aa57a03769426ca5c5a6487fad09f069e00a8db156cba546912ea8b65a276b8
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:7beb9161d706250f64c16edf6c95386c3e1f4dff91df260a40de716ddac15110
8+
digest: sha256:95b99dfb8255f379fd282e4fc07d1ff0a7cce67dcf88bed0958fbfc72bd4c530
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:e8b8078837f9c448d6f99389cb7e79d3470fc1d7557fbb92856ea523f37d7014
11+
digest: sha256:9f3e7ddd058ed44134d8bf37ed2d27b5765c2504c5a3bd3be5e57385f79c8eef
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:7beb9161d706250f64c16edf6c95386c3e1f4dff91df260a40de716ddac15110
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95b99dfb8255f379fd282e4fc07d1ff0a7cce67dcf88bed0958fbfc72bd4c530
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:3694a2caa57aabc0883a7b4ca9c5e52afd7a9ea3c81da93c0b1e490d7ac8c5fa
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aa57a03769426ca5c5a6487fad09f069e00a8db156cba546912ea8b65a276b8
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.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.22.0-0.nightly-arm64-2026-01-19-012506"
3+
"base": "4.22.0-0.nightly-arm64-2026-01-20-012506"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5effb258331e53fe882935462bcb1cc8044ddbfb03985bb77973cf1ebedda73",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d4d2967cdde2d5481d53680c634c76b5f9622944c664d26f0a5d96c4407625e",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dfc002be07174090a7d1d671eec55d01f4694d7b8dbba80dbacd9e922c357aa3",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bddb2494726b7421e89d6167cb699a57f7ba43caed02e46a54b9fd903e94aa0",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eda70ca394fd8960fa0befd53948e8be7d66acc54127ee3eaf05af57ee85655e"
99
}
1010
}

‎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.22.0-0.nightly-2026-01-14-031657"
3+
"base": "4.22.0-0.nightly-2026-01-19-085729"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3694a2caa57aabc0883a7b4ca9c5e52afd7a9ea3c81da93c0b1e490d7ac8c5fa",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7beb9161d706250f64c16edf6c95386c3e1f4dff91df260a40de716ddac15110",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8b8078837f9c448d6f99389cb7e79d3470fc1d7557fbb92856ea523f37d7014"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8aa57a03769426ca5c5a6487fad09f069e00a8db156cba546912ea8b65a276b8",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95b99dfb8255f379fd282e4fc07d1ff0a7cce67dcf88bed0958fbfc72bd4c530",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f3e7ddd058ed44134d8bf37ed2d27b5765c2504c5a3bd3be5e57385f79c8eef"
99
}
1010
}

0 commit comments

Comments
 (0)