Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-04-08-163320_amd64-2025-04-08_arm64-2025-04-08 #4781

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
openshift-merge-bot merged 9 commits into from
Apr 9, 2025
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-04-08-163320_amd64-2025-04-08_arm64-2025-04-08 #4781

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
99ada1e
update last_rebase.sh
Apr 9, 2025
cd3e230
update changelog
Apr 9, 2025
3c5f596
update microshift/go.mod
Apr 9, 2025
a290406
update microshift/vendor
Apr 9, 2025
f059d27
update etcd/go.mod
Apr 9, 2025
fdb45bf
update etcd/vendor
Apr 9, 2025
21a7b75
update component images
Apr 9, 2025
63a1256
update manifests
Apr 9, 2025
db8a082
update buildfiles
Apr 9, 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
2 changes: 1 addition & 1 deletion 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.3
KUBE_GIT_COMMIT=ab01febeea8ddbdf96c353a2ef35324ea69e4eb7
KUBE_GIT_COMMIT=c17291b1e40554b4e5b3ccff01b6d590af2e7a43
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-04-05-212415
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-04-08-184617
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-04-04-170728
OCP_VERSION := 4.19.0-0.nightly-2025-04-08-163320
2 changes: 1 addition & 1 deletion assets/components/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-04-05-212415"
"base": "4.19.0-0.nightly-arm64-2025-04-08-184617"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc590b56eccdd9d705d1780430750060d83217f76a219a351ee9b24b14980246",
Expand Down
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-x86_64.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-2025-04-04-170728"
"base": "4.19.0-0.nightly-2025-04-08-163320"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:144cf4b802f225a4b1ac88a9c6b20ae1ba5b426cfcc1223a6e7d59c6f3146bb3",
Expand Down
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-04-05-212415"
"base": "4.19.0-0.nightly-arm64-2025-04-08-184617"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2d74b48f84439ad5dac8d7a5636fdb2481127e749d91e950fcdf35b972c1200",
Expand Down
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-04-04-170728"
"base": "4.19.0-0.nightly-2025-04-08-163320"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f5e70abb7fb6a9e5188c4597363870132e64d886cb21de683b488c972278d63",
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-aarch64.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-arm64-2025-04-05-212415"
"base": "4.19.0-0.nightly-arm64-2025-04-08-184617"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1449068d296b297562ead39c6293202326fa714e7413fbd1dd3e85fd0bebd720",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a05262c9628d8a4e26aae639dd4ac6b9b0593f85baf40b38c7934f3cd1d6bb3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09fecdad3ab1a5a883629eaba42c0a15ac0897944a82290a5961e51314c4f167",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a92057ccbec66df6748bf7d737e70e6960d080b74ed6d8bbb008ca799b6baa70",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bf9f7dd0d566d8616599a52606ee4c1fae787dfec1d80af7212e71c65b37693",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d99fc8152596530983c2a02f7634075623cbdfdf137c4d5d69eb9e944520582",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e051584f14420a9d07df786734fcfeb93d80435997cd54a7dab97d05110b590",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df99da42bec245386269967145e475f36ae41d0e4a6824cf0d80831d116e5147",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d8f3a4dd82321cf98a1785170ad85076ff83b667ff90aef42e86e1b7ec0b5be",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd87d009b26a8d3c8ef11f693ecb65ee29bd56f5237eec3b2d3447b13de802cb",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb05a01428969c5ef0b3c838c19f92eda6754a0855ce05afa49575aa45978ce3"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6200715352f3126bc417e10383968793236c0c57f259c1d9555a77051e326e1"
}
}
10 changes: 5 additions & 5 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-04-04-170728"
"base": "4.19.0-0.nightly-2025-04-08-163320"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af75002960358d4f80fc7163337861756fcc431ec4ca7f302aaacb61f9b24c73",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a1b70921ca8931083e80809c20e922f675b80fb017142f7e10a1f671e066cf",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0f4e0293f973ad9adad7410740fd95eaf842d07376876f07a5d45be0a1ee088",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fbb56bbc30fc4aa4880e29c7a7c2580b6f42c68817ac42801b88d9b6f9dca20",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06315ea009f9fc2bec3a673e95ee7a0c63da864a0613605972a3a6a6e69f9a9c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b412d884b5f6bfa1849942bbeaeb4d59861b38a60b80509546af16866348bf8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6a25abd3a3d878349717beef68e6af11ccf13f2c94ba35343f5e6039a5c9109",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a30d4bef9aaf396871ba093e7dc1f12a45522096bfc6ff9c3e218ebd728a79e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:203dc8e38bd8abda02ea37e7dc1bb94c58eba18bc069b02b9fdb859f8951b7d9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52c8959c444253717fb6c7a3434a7d1e7117b5d474dc048656a99770ac547ca",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d420e355a18cd2842b800a587bc4fb4d216475e8a63c101e1a69773a7e4305f"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df61b62ae7225895102386877605e1550878db7d6534e58247e1c42fab6b7b9d"
}
}
64 changes: 32 additions & 32 deletions etcd/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,39 +150,39 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250403195339-ab01febeea8d // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250403195339-ab01febeea8d // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250404114215-c17291b1e405 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250404114215-c17291b1e405 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
)

replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250404114215-c17291b1e405 // staging kubernetes

replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250404114215-c17291b1e405 // staging kubernetes

replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250403195339-ab01febeea8d // staging kubernetes
replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250404114215-c17291b1e405 // staging kubernetes
Loading