Skip to content

Commit 2bae54f

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-02-21-040517_amd64-2026-02-21_arm64-2026-02-22 (#6262)
* Update Go version * update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles * Update AI Model Serving for MicroShift * Update SR-IOV for MicroShift --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 4e5d27c commit 2bae54f

27 files changed

Lines changed: 145 additions & 107 deletions

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-02-18-222813
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-22-222813

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-02-18-151605
1+
OCP_VERSION := 4.22.0-0.nightly-2026-02-21-040517

assets/components/multus/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: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06
5+
digest: sha256:4a78525b5807956eb12f9db42fe3fa26e5ad85a18fa991a6f5f7794ae01c214b
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:267c37338b0fddc68fd1b7657c722ee0238675ef85b0f274e69fdf96d9df26c6
8+
digest: sha256:a50647b1e447588d3707ec077d844eba09e92f47707e86fe06ef551d1d5ebd88

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:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8
5+
digest: sha256:86bb96a9e6fcf4a2e3c393ef82324d1030e0154e509a3becc70f6e3becd6264e
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:474aa143fb27219d5be46488f70a56e0fdf25864276fbcfd48c64d10329ab341
8+
digest: sha256:198efa5629b1936d0a91dc88ab614265a9540acc965c9199feff0d9dbbf7517f
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-arm64-2026-02-18-222813"
3+
"base": "4.22.0-0.nightly-arm64-2026-02-22-222813"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:267c37338b0fddc68fd1b7657c722ee0238675ef85b0f274e69fdf96d9df26c6"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a78525b5807956eb12f9db42fe3fa26e5ad85a18fa991a6f5f7794ae01c214b",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a50647b1e447588d3707ec077d844eba09e92f47707e86fe06ef551d1d5ebd88"
88
}
99
}
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-02-18-151605"
3+
"base": "4.22.0-0.nightly-2026-02-21-040517"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:474aa143fb27219d5be46488f70a56e0fdf25864276fbcfd48c64d10329ab341"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86bb96a9e6fcf4a2e3c393ef82324d1030e0154e509a3becc70f6e3becd6264e",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198efa5629b1936d0a91dc88ab614265a9540acc965c9199feff0d9dbbf7517f"
88
}
99
}

assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ metadata:
1313
namespace: kserve
1414
data:
1515
explainers: "{}"
16-
oauthProxy: |-
16+
oauthProxy: |-
1717
{
18-
"image" : "$(oauth-proxy)",
18+
"oauthProxyImage" : "$(oauth-proxy)",
19+
"kubeRbacProxyImage" : "$(kube-rbac-proxy)",
1920
"memoryRequest": "64Mi",
2021
"memoryLimit": "128Mi",
2122
"cpuRequest": "100m",

assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ vars:
152152
apiVersion: v1
153153
kind: ConfigMap
154154
name: kserve-parameters
155+
- fieldref:
156+
fieldpath: data.kube-rbac-proxy
157+
name: kube-rbac-proxy
158+
objref:
159+
apiVersion: v1
160+
kind: ConfigMap
161+
name: kserve-parameters
155162
- fieldref:
156163
fieldpath: data.kserve-llm-d-inference-scheduler
157164
name: kserve-llm-d-inference-scheduler

assets/optional/ai-model-serving/kserve/overlays/odh/params.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ kserve-llm-d=ghcr.io/llm-d/llm-d-dev:sha-b3f0b0d
66
kserve-llm-d-inference-scheduler=quay.io/opendatahub/llm-d-inference-scheduler:odh-v2.33
77
kserve-llm-d-routing-sidecar=quay.io/opendatahub/llm-d-routing-sidecar:odh-v2.33
88
oauth-proxy=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08
9+
kube-rbac-proxy=registry.redhat.io/rhoai/odh-kube-auth-proxy-rhel9@sha256:1f4b2b9bb5061faf17299c2ae2405ab408e2b7ce349d9831eb6045990e6da005
10+

assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ metadata:
55
namespace: kserve
66
data:
77
explainers: "{}"
8-
oauthProxy: |-
8+
oauthProxy: |-
99
{
10-
"image" : "$(oauth-proxy)",
10+
"oauthProxyImage" : "$(oauth-proxy)",
11+
"kubeRbacProxyImage" : "$(kube-rbac-proxy)",
1112
"memoryRequest": "64Mi",
1213
"memoryLimit": "128Mi",
1314
"cpuRequest": "100m",

0 commit comments

Comments
 (0)