Skip to content

NO-ISSUE: rebase-release-4.19-4.19.0-0.nightly-2025-06-15-192624_amd64-2025-06-15_arm64-2025-06-15 #5062

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 5 commits into from
Jun 16, 2025
Merged

NO-ISSUE: rebase-release-4.19-4.19.0-0.nightly-2025-06-15-192624_amd64-2025-06-15_arm64-2025-06-15 #5062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2f6834
update last_rebase.sh
Jun 16, 2025
44df9d4
update changelog
Jun 16, 2025
608cf93
update component images
Jun 16, 2025
8e22081
update manifests
Jun 16, 2025
78b33eb
update buildfiles
Jun 16, 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.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-06-12-165924
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-06-15-225924
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-06-09-210043
OCP_VERSION := 4.19.0-0.nightly-2025-06-15-192624
4 changes: 2 additions & 2 deletions assets/components/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:ace968e35ddb5f61fbd1af21f112f14ed1391cbd6874bd01890fe4ce2f4edee0
digest: sha256:1a22500afb936ea2b0d36574dd88a364749e7ad9e4bcdb290774a2014a14469f
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3d16b508e629f3bb503938bef9b00fa9e012e89ca4be8317fd04cc353960fb32
digest: sha256:3c58c276093f74187677cba3679f7e77192908ab74c7d2acfff88438130c9be5
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-06-12-165924"
"base": "4.19.0-0.nightly-arm64-2025-06-15-225924"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd426f9038a2bbdf8133673364b6fc65e6d0042d0d0ef4a1f3c1ec5e756e53ff",
Expand Down
6 changes: 3 additions & 3 deletions assets/components/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-06-09-210043"
"base": "4.19.0-0.nightly-2025-06-15-192624"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ace968e35ddb5f61fbd1af21f112f14ed1391cbd6874bd01890fe4ce2f4edee0",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d16b508e629f3bb503938bef9b00fa9e012e89ca4be8317fd04cc353960fb32"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a22500afb936ea2b0d36574dd88a364749e7ad9e4bcdb290774a2014a14469f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c58c276093f74187677cba3679f7e77192908ab74c7d2acfff88438130c9be5"
}
}
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
images:
- name: kube-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d510010ecebe11727db02130a48cda44bd6618f4ec2be1addb9cd834806f1d1f
digest: sha256:f8be7c69631ddd8096b054cb3e9db40d2a830d2e7de47d6d3cad1d838589d2aa
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-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-06-12-165924"
"base": "4.19.0-0.nightly-arm64-2025-06-15-225924"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d62727964708ee6088083a78342dffffd5641dddb8347721e3b1d329c4ee3201"
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-06-09-210043"
"base": "4.19.0-0.nightly-2025-06-15-192624"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d510010ecebe11727db02130a48cda44bd6618f4ec2be1addb9cd834806f1d1f"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8be7c69631ddd8096b054cb3e9db40d2a830d2e7de47d6d3cad1d838589d2aa"
}
}
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:149f3ecb200c09ec858b7e737f73f75cf84310da48972d06b28a18cbbf847355
digest: sha256:c7a0519bdfe45ab3f01798ac6ad798cadf854adedea433bcb4cc9c44402f4704
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:545b6bc45561958661e94460ae4efdbb9771f67dbdd068abde6e658fb10edc2f
digest: sha256:a119441628556b8f59a651f27d8da34d2956f1d88687bc164b2db555819d5c9a
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cbded89e7cd05e5c21aa88a005ce274ce0d3794b23fc9d841c2b159f840e0ca3
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:545b6bc45561958661e94460ae4efdbb9771f67dbdd068abde6e658fb10edc2f
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a119441628556b8f59a651f27d8da34d2956f1d88687bc164b2db555819d5c9a
- 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:149f3ecb200c09ec858b7e737f73f75cf84310da48972d06b28a18cbbf847355
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7a0519bdfe45ab3f01798ac6ad798cadf854adedea433bcb4cc9c44402f4704
target:
kind: Deployment
labelSelector: app=catalog-operator
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:5e0c0ad77a209ea9590e58bc042968a6bcd323ceaab72e5260561c7aba4ab96c
digest: sha256:603458a718ee271af4c1cc6459be9862e551ef214064e6da7d870fb7867fa666
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:662572b59e27bbeaba0d8f35db4d6f9dbb8e22643e2fd7e04ae8d1f4322215e1
digest: sha256:d057d131605330a86c84f951c149c80b24fa242f88c0cb451e729e2e47f305bd
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:98b9b1d008214073849d95ec6aa35a47d3108e3f7436f0d823243e399f8e6f4a
digest: sha256:a7ea177ff2a08e6856c4433a2a95a4ea020b04fa4669835df168a5e6caa10002

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:662572b59e27bbeaba0d8f35db4d6f9dbb8e22643e2fd7e04ae8d1f4322215e1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d057d131605330a86c84f951c149c80b24fa242f88c0cb451e729e2e47f305bd
- 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:5e0c0ad77a209ea9590e58bc042968a6bcd323ceaab72e5260561c7aba4ab96c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:603458a718ee271af4c1cc6459be9862e551ef214064e6da7d870fb7867fa666
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions 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,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-06-12-165924"
"base": "4.19.0-0.nightly-arm64-2025-06-15-225924"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:149f3ecb200c09ec858b7e737f73f75cf84310da48972d06b28a18cbbf847355",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:545b6bc45561958661e94460ae4efdbb9771f67dbdd068abde6e658fb10edc2f",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7a0519bdfe45ab3f01798ac6ad798cadf854adedea433bcb4cc9c44402f4704",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a119441628556b8f59a651f27d8da34d2956f1d88687bc164b2db555819d5c9a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbded89e7cd05e5c21aa88a005ce274ce0d3794b23fc9d841c2b159f840e0ca3"
}
}
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-06-09-210043"
"base": "4.19.0-0.nightly-2025-06-15-192624"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e0c0ad77a209ea9590e58bc042968a6bcd323ceaab72e5260561c7aba4ab96c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:662572b59e27bbeaba0d8f35db4d6f9dbb8e22643e2fd7e04ae8d1f4322215e1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98b9b1d008214073849d95ec6aa35a47d3108e3f7436f0d823243e399f8e6f4a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:603458a718ee271af4c1cc6459be9862e551ef214064e6da7d870fb7867fa666",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d057d131605330a86c84f951c149c80b24fa242f88c0cb451e729e2e47f305bd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ea177ff2a08e6856c4433a2a95a4ea020b04fa4669835df168a5e6caa10002"
}
}
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-06-12-165924"
"base": "4.19.0-0.nightly-arm64-2025-06-15-225924"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a20d81d51e7a5c28c7f8c963cf66345923e6309320d83f5410c1dd71d3dfa464",
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-06-09-210043"
"base": "4.19.0-0.nightly-2025-06-15-192624"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4b41ea0180046a3c6523df9390dc600230db03fdaa2ea415ace9b50765af9d0",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2dec506297ca352a41e5c8ba9f60227cfe32a5b76d9240771682ffb025fab82",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07bdf64bb02687d2aca8e7c311a713fe356f76772815515294698bbe44d84572",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98b9b1d008214073849d95ec6aa35a47d3108e3f7436f0d823243e399f8e6f4a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d67e19f43e988abf3212b388a2fd6295bb923f1410192a941d9f2b4d3e98a4a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8afe6a7a117d8d640d3987c83bfb05308e75455eb4ab9573ae7682bbe3c1d5f6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5205ad4cb639bc5449eb5408ae42c16e2d95b54bf2298ec9db95e84952c3c37d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:038ae11f889c997352d21d3edd8a81972c6b412d766e10faf8951437bd249ce8",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abb2e220055014973857d13cff62e53274af75c61a6c68400905a3bac896748a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d1ceb9c0a8ed55a13468b846352c6227f7febfa3b7e2ce3c76be574580845a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ea177ff2a08e6856c4433a2a95a4ea020b04fa4669835df168a5e6caa10002",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e5048d408ab03374f74e00b3c2d09659250598c1b03e2b428ef0b90f96cd367",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2a7265a7212e3bcf97aa5bcab63bf8fe8fc76242da462191dac65232b8503da",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85343e77ef4008a87f44e3a8b23bb107aafe917f4504e1d23e4aa1a798a1bd25",
"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:a08a7861925fb149449632d5d88a94ef4d5c3f78a5bba94968a45bd8141ddf1b"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63c6e12e4b15f0d1b1455260064788981379f62398f2ef4b5cb3b30d7ca1969a"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ plugin_dirs = [
# for community builds on top of OKD, this setting has no effect
[crio.image]
global_auth_file="/etc/crio/openshift-pull-secret"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8afe6a7a117d8d640d3987c83bfb05308e75455eb4ab9573ae7682bbe3c1d5f6"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2a7265a7212e3bcf97aa5bcab63bf8fe8fc76242da462191dac65232b8503da"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
7 changes: 7 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
- openshift-controller-manager embedded-component 8be524d728d03e61ee029ad2f7229ca97c93f87f to af43fe68a7d862959a797b66307a1277fffbc9df
- dabcff4 2025-06-10T11:00:27+02:00 Set node-pullsecrets volume to read-only to protect image pull credentials

- operator-framework-olm embedded-component 358b7053a231876cda29cf4d822e3e702389b117 to 4a6530a4cf4e8e81d8f04923f36dd36023f45902
- 4bbf010a 2025-06-11T14:11:48-05:00 reduce cache expiriry frequency (#3591)
- e4efee43 2025-06-10T08:05:31-04:00 operatorgroup: ensure clusterroleselectors in clusterrole aggregation rules are sorted (#3593)

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4
https://github.com/openshift/kubernetes embedded-component fadb78e720779ed1b29f32170f3e9dd32584a7e6
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4ab93e07bb7c525990ef21a11caae2122ace63f6
https://github.com/openshift/machine-config-operator embedded-component 70025364a114fc3067b2e82ce47fdb0149630e4b
https://github.com/openshift/openshift-controller-manager embedded-component 8be524d728d03e61ee029ad2f7229ca97c93f87f
https://github.com/openshift/operator-framework-olm embedded-component 358b7053a231876cda29cf4d822e3e702389b117
https://github.com/openshift/openshift-controller-manager embedded-component af43fe68a7d862959a797b66307a1277fffbc9df
https://github.com/openshift/operator-framework-olm embedded-component 4a6530a4cf4e8e81d8f04923f36dd36023f45902
https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33
https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7
https://github.com/openshift/oc image-amd64 8f1c8b5768cdff8885ddef28e10de2c1928daf92
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-06-09-210043" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-06-12-165924"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-06-15-192624" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-06-15-225924"