Skip to content

Commit 6130658

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-03-19-160541_amd64-2025-03-19_arm64-2025-03-19 (#4709)
* update last_rebase.sh * update changelog * update microshift/go.mod * 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 0f3b144 commit 6130658

26 files changed

+436
-311
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=32
33
KUBE_GIT_VERSION=v1.32.2
4-
KUBE_GIT_COMMIT=d6f2dd28529e5ecc8cdffaf443253f74382c2b60
4+
KUBE_GIT_COMMIT=2ed17b46fa89c438d5983268bdc352ba8bd9b4bb
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.19.0-0.nightly-arm64-2025-03-17-210236
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-19-200021

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.19.0-0.nightly-2025-03-14-061055
1+
OCP_VERSION := 4.19.0-0.nightly-2025-03-19-160541

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.19.0-0.nightly-arm64-2025-03-17-210236"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-19-200021"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea1e801f53c7cb86011519dab3f10c5d52f9f92090d4afaa943c1d658db753d6",

assets/optional/multus/release-multus-x86_64.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.19.0-0.nightly-2025-03-14-061055"
3+
"base": "4.19.0-0.nightly-2025-03-19-160541"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05",

assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ spec:
10311031
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
10321032
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10331033
1034-
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
1034+
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/
10351035
type: string
10361036
enum:
10371037
- legacy

assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: openshift-operator-lifecycle-manager
55
labels:
66
pod-security.kubernetes.io/enforce: restricted
7-
pod-security.kubernetes.io/enforce-version: "v1.24"
7+
pod-security.kubernetes.io/enforce-version: latest
88
openshift.io/scc: ""
99
openshift.io/cluster-monitoring: "true"
1010
annotations:
@@ -21,7 +21,7 @@ metadata:
2121
name: openshift-operators
2222
labels:
2323
pod-security.kubernetes.io/enforce: privileged
24-
pod-security.kubernetes.io/enforce-version: "v1.24"
24+
pod-security.kubernetes.io/enforce-version: latest
2525
openshift.io/scc: ""
2626
annotations:
2727
openshift.io/node-selector: ""

assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89
5+
digest: sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76
8+
digest: sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea
@@ -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:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a
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:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887
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.19.0-0.nightly-arm64-2025-03-17-210236"
3+
"base": "4.19.0-0.nightly-arm64-2025-03-19-200021"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4a6155d39da15f5053c2e475e895caadac7f940a29d5d66a94dace35d12806",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-03-14-061055"
3+
"base": "4.19.0-0.nightly-2025-03-19-160541"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90df7383d1f2f028744bd66dc366ba9378558530dae3afd9eddaf155e62abc89",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09e6d565a37036fed6cb9d151528067d89f0e99c0c2fe8b64a7528e504604e76",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea"
99
}
1010
}

0 commit comments

Comments
 (0)