Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-02-25-035256_amd64-2025-02-25_arm64-2025-02-25 #4603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 26, 2025
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-02-25-035256_amd64-2025-02-25_arm64-2025-02-25 #4603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a2537a
update last_rebase.sh
Feb 26, 2025
f09c65f
update changelog
Feb 26, 2025
75e4b26
update microshift/go.mod
Feb 26, 2025
156f3a4
update microshift/vendor
Feb 26, 2025
8a4cbac
update etcd/go.mod
Feb 26, 2025
95c509c
update etcd/vendor
Feb 26, 2025
cb3dea4
update component images
Feb 26, 2025
8831e93
update manifests
Feb 26, 2025
81e80b7
update buildfiles
Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=32
KUBE_GIT_VERSION=v1.32.1
KUBE_GIT_COMMIT=79a6bafe8c66e9d2fe02cd33a45a5d37519de91e
KUBE_GIT_VERSION=v1.32.2
KUBE_GIT_COMMIT=86db063ce6f244acf7d437bda201600d568f9548
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-25-005457
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-25-065457
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-2025-02-20-131651
OCP_VERSION := 4.19.0-0.nightly-2025-02-25-035256
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fe993c8c6ae871819a3dcf62c66945ecd32973724ff51ea3c2b1af89dc787d3e
digest: sha256:e0736e995df08e13ae5c9748651a32060a21f16d395a18231ae2ee7740920839
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0a32f77a6f12aa8fb4963d998291c6bfa9ec4070946ee044f797d7958d4fea07
digest: sha256:cc81671a9e25456c4fe7a80e0aea3a2be0945053312988c7f409fa14f77db1a4
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-02-25-005457"
"base": "4.19.0-0.nightly-arm64-2025-02-25-065457"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b38692fd33a1d658622565a26d9d3f8ca93a6bf0320b8252d2f12cc38bcaca3",
Expand Down
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-02-20-131651"
"base": "4.19.0-0.nightly-2025-02-25-035256"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe993c8c6ae871819a3dcf62c66945ecd32973724ff51ea3c2b1af89dc787d3e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a32f77a6f12aa8fb4963d998291c6bfa9ec4070946ee044f797d7958d4fea07"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0736e995df08e13ae5c9748651a32060a21f16d395a18231ae2ee7740920839",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc81671a9e25456c4fe7a80e0aea3a2be0945053312988c7f409fa14f77db1a4"
}
}
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.0
controller-gen.kubebuilder.io/version: v0.17.2
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79
digest: sha256:fcc03fc510692a777983557df4d9c87dc08f65505f7c9c3e6f757372e3c593d0
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093
digest: sha256:785b205ee187168a3cf0dc5fbc1e4928cba580b6ae3b3ced6b0b7d07e613b357
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc
digest: sha256:4eb002692ce22b3a33c0f53186b4d68c66ac6c97e66662cdc968b3726b0eeaff

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:785b205ee187168a3cf0dc5fbc1e4928cba580b6ae3b3ced6b0b7d07e613b357
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcc03fc510692a777983557df4d9c87dc08f65505f7c9c3e6f757372e3c593d0
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-02-25-005457"
"base": "4.19.0-0.nightly-arm64-2025-02-25-065457"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a9c8e4a625e17a54dd1a0910e183edfe65e1a55f4038cef3840fa9dc35d1b57",
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-02-20-131651"
"base": "4.19.0-0.nightly-2025-02-25-035256"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af0f56f398896ded6e85ce2da2673f285e1ce14d0efeb3f185bc95411928a79",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02563f3ea2fa28191f2ea58845f1bd5bb970fe4bbcb0aaf99129a031b27b6093",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcc03fc510692a777983557df4d9c87dc08f65505f7c9c3e6f757372e3c593d0",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:785b205ee187168a3cf0dc5fbc1e4928cba580b6ae3b3ced6b0b7d07e613b357",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eb002692ce22b3a33c0f53186b4d68c66ac6c97e66662cdc968b3726b0eeaff"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-02-25-005457"
"base": "4.19.0-0.nightly-arm64-2025-02-25-065457"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0aa62b58030227762398fddd2304b15b5a3dee2f8f84b6106df797a7aadf5cc",
Expand Down
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-02-20-131651"
"base": "4.19.0-0.nightly-2025-02-25-035256"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c9486eedbe3d43494a444496ceefca4b1d73eb59d446f507de999b5b1a50503",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9de1fd4c84142e481f1c81e6f754f4814e7860343d5ed0e12b1e4516f45a03b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f48387b2c96fe1f8b2450da76b0e54b7f9b057d4b914e79cad11ddde91c3c4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb7a33a80053a3cdbba9e8df2110a6188a1e1e684abac6d94ab5528cf4349cc",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d481af79ae24557f2bc9b71e7d4693ce8d4d700709b756166f7b4624fcc5e7f8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:209e650647959ab8d0260670257a364063ce2c9e655509a94cf1b2e4e3712b0e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c8b3c62e2a4cca60fdc483f021c1f8c7ee5d888b3a880ac1ac8adef5a59fb28",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8249e6477fdf33a16f8c3e77786dce67d1d714b71bec1f790e0bf96eaeccd74b",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d04937a2788cde5e016f7e9f29a1391e67cda4cb74e3edbc29f06f59ed7c7c3e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117f285db1ac97e74863a3e29838ed154ddbfeccfad30178de46c8450c0544f6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eb002692ce22b3a33c0f53186b4d68c66ac6c97e66662cdc968b3726b0eeaff",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8091c1eda5c715276eb5ba3ced518de2486417b33e6bb919a56d5b82084b25a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83356ce607ee9d5f1e91b0367e2441e07d44c601171a5b56d2e59900ccd99879",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f2124e17f51844658282ee1f76710a0c5264a7eb4d55686ea7f7a77d0907373c",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d44128ade44ec280cb241ac15d90dc1ddf37e730a29e8ce6110db69a940f8d88"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88ddbad43a65121a749ce3c34e82393ec8d65dc60225022bfad85851a2834076"
}
}
Loading