Skip to content

Commit 302a842

Browse files
Merge pull request #6362 from pacevedom/rebase-rebase-temp-4.22.0-0.nightly-2026-03-15-203841_amd64-2026-03-15_arm64-2026-03-16
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-03-15-203841_amd64-2026-03-15_arm64-2026-03-16
2 parents 910564b + f8d0be6 commit 302a842

12,641 files changed

Lines changed: 624060 additions & 536278 deletions

File tree

Some content is hidden

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

Makefile.kube_git.var

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
2-
KUBE_GIT_MINOR=34
3-
KUBE_GIT_VERSION=v1.34.2
4-
KUBE_GIT_COMMIT=047d96223dd843e9d54bed59bc212d2e9122c56a
2+
KUBE_GIT_MINOR=35
3+
KUBE_GIT_VERSION=v1.35.2
4+
KUBE_GIT_COMMIT=2034d92b4a3a51d42e306ba405fc10a89768ac69
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-03-05-024021
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-16-023946

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-03-02-153725
1+
OCP_VERSION := 4.22.0-0.nightly-2026-03-15-203841

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:067b86d045349126085a17e0d067719a8050fe99f968d49f28cb8d677641f4bc
5+
digest: sha256:346179a6e0b2b56a4f1ba1a0085bdb58cd9ef1ac3514018d1f3351e48e81b275
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:745ab5899600afbf9d92221fb9692988a006dec38004b9313fa7315fccc9ae45
8+
digest: sha256:40c1962394cb18ec4ea81eb0a301f76330fb7c4b0b27eaf5eded647b9e86b90e

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:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725
5+
digest: sha256:a0d4399c420679b4b33edd4554c44ab825585d4efccca2291c20a627df8b09c6
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132
8+
digest: sha256:9a9e34cc3ccad8eba2b490c787113d20acacbb36a1b601783d3d41199e8cc6e7
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-03-05-024021"
3+
"base": "4.22.0-0.nightly-arm64-2026-03-16-023946"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:067b86d045349126085a17e0d067719a8050fe99f968d49f28cb8d677641f4bc",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:745ab5899600afbf9d92221fb9692988a006dec38004b9313fa7315fccc9ae45"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:346179a6e0b2b56a4f1ba1a0085bdb58cd9ef1ac3514018d1f3351e48e81b275",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40c1962394cb18ec4ea81eb0a301f76330fb7c4b0b27eaf5eded647b9e86b90e"
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-03-02-153725"
3+
"base": "4.22.0-0.nightly-2026-03-15-203841"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:709d3f3d6e6a49fabacefd96ed468ad973ae0f5da1f1b61b5140bea099e7a725",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fef5e57ea4cbccaf400b4df0c2429f1b6ba00707acb593b6c58e719cb19c5132"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0d4399c420679b4b33edd4554c44ab825585d4efccca2291c20a627df8b09c6",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a9e34cc3ccad8eba2b490c787113d20acacbb36a1b601783d3d41199e8cc6e7"
88
}
99
}

assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:274bc2a82a869641e4f9a659faa5c42a442032968905330fc0a08a15d4b92a02
5+
digest: sha256:2117f6b445a949a484722170568f69b64ad35c728eb23a20f439e6dbbbf0c6ab
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:02b7fddc0b494a6ea4c716ff863888d32e4aca00d2e937b19760a9a15ab2f04a
8+
digest: sha256:ede57976518d8de0e2b466e1529a8acffe1bc2a9e59f65766362fae0bef88ada
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:c11fbc6f32b7cff7d11d63dda6c4b785c3425f1c80521312801975b5e4032bac
11+
digest: sha256:404e91fe9b4e8281891e017be366b9a7eb312a2cfd35df45c4e97442f000d897
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:02b7fddc0b494a6ea4c716ff863888d32e4aca00d2e937b19760a9a15ab2f04a
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ede57976518d8de0e2b466e1529a8acffe1bc2a9e59f65766362fae0bef88ada
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:274bc2a82a869641e4f9a659faa5c42a442032968905330fc0a08a15d4b92a02
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2117f6b445a949a484722170568f69b64ad35c728eb23a20f439e6dbbbf0c6ab
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:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26
5+
digest: sha256:c8b30a999339e0d278e12459cc6e9717fef134c31bf8d197f2decd58e69a3ce1
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007
8+
digest: sha256:37a44a613e53626d6adf4556219701e16455fb71603eca7865d464ffcb0d73ed
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:957bb71c53f9f45a46cd471fe6ece04fe0adf65a489a5cf36c20d7941cb3bfe6
11+
digest: sha256:2ead40d6af5a9159a3452c2aeeb347bcc63064f7cc4858e789473581c7e0158b
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:c29ea5cb6e084b49b115f1c26c7967090d009e39e68f905841c95415abc40007
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37a44a613e53626d6adf4556219701e16455fb71603eca7865d464ffcb0d73ed
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:6ae79da6531bf3b60092e0d20de14251bf11530c0339c6c2b616f79584867f26
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8b30a999339e0d278e12459cc6e9717fef134c31bf8d197f2decd58e69a3ce1
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator
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-arm64-2026-03-05-024021"
3+
"base": "4.22.0-0.nightly-arm64-2026-03-16-023946"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274bc2a82a869641e4f9a659faa5c42a442032968905330fc0a08a15d4b92a02",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02b7fddc0b494a6ea4c716ff863888d32e4aca00d2e937b19760a9a15ab2f04a",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c11fbc6f32b7cff7d11d63dda6c4b785c3425f1c80521312801975b5e4032bac"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2117f6b445a949a484722170568f69b64ad35c728eb23a20f439e6dbbbf0c6ab",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ede57976518d8de0e2b466e1529a8acffe1bc2a9e59f65766362fae0bef88ada",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:404e91fe9b4e8281891e017be366b9a7eb312a2cfd35df45c4e97442f000d897"
99
}
1010
}

0 commit comments

Comments
 (0)