Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.8
KUBE_GIT_COMMIT=b5229e8311fe15cd8e9a70de2279868726b19f84
KUBE_GIT_COMMIT=335be3a93cc6f48d84e5e6cd515ef748efb9664b
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-09-10-204736
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-09-11-084736
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.19.0-0.nightly-2025-09-10-184745
OCP_VERSION := 4.19.0-0.nightly-2025-09-14-165440
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
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:e345c7e9a1fa04ddf7f8793f443f543675d5b009e794248eb6b117fae7c7d4d7
digest: sha256:aa4e51a6dd24592731e45c0eb87614ab4ba2889846b28e9c9c4acf4171642cb3
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a686440bba2d1c73922da126f7435d892ab23b8c3941259b5d3a20d595fd5303
digest: sha256:9cc006338f74e24535b31c9a25c0f1565e6148c5d47af64706e78f216a32baa7
2 changes: 1 addition & 1 deletion assets/components/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-09-10-204736"
"base": "4.19.0-0.nightly-arm64-2025-09-11-084736"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e44ddc55bd6015c7699eeecb7e2b09f1b52169799957c668217e0d5cd70fc7fc",
Expand Down
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-09-10-184745"
"base": "4.19.0-0.nightly-2025-09-14-165440"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e345c7e9a1fa04ddf7f8793f443f543675d5b009e794248eb6b117fae7c7d4d7",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a686440bba2d1c73922da126f7435d892ab23b8c3941259b5d3a20d595fd5303"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa4e51a6dd24592731e45c0eb87614ab4ba2889846b28e9c9c4acf4171642cb3",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cc006338f74e24535b31c9a25c0f1565e6148c5d47af64706e78f216a32baa7"
}
}
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.x86_64.yaml
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:d8eb3c8706e61a3a2680b62ff2f13fd0377ce4b4219c03aa6a29ab60b519d7ec
digest: sha256:fae3319673925fc5473cf46afb763a229ef79bb7ff1e563a1ee211a753d3694a
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/release-kube-proxy-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-09-10-204736"
"base": "4.19.0-0.nightly-arm64-2025-09-11-084736"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a85e9ad247ee678c0ae37cf07c5f30bf3be67d157e93dac387204f9b6d22dbc3"
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-09-10-184745"
"base": "4.19.0-0.nightly-2025-09-14-165440"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8eb3c8706e61a3a2680b62ff2f13fd0377ce4b4219c03aa6a29ab60b519d7ec"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fae3319673925fc5473cf46afb763a229ef79bb7ff1e563a1ee211a753d3694a"
}
}
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:f121ad822f8d564f09432cf5a49380fa959d5dfa18afd45453784d9335e8839f
digest: sha256:1c1451ddfda2bf2fad982ad02b761b0a4f34dca3123a387e3b252572fb630152
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6b0fb0ddfb58613239273bae0a1dcf8039167a287af524f147819e5fd0e139a4
digest: sha256:54c61e151396127b6acb95eaeb000470dd67dd517b271baa8fd58aaf664a2651
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:40618c352ebfdcbc5efd18b868e18d9b951897b0ea592ba17288ca2c14d73c71
digest: sha256:3f4c01d40c5bc89aaf3a5f035a62d5e20dc325d801120eec48d9e2b77165acf8

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:6b0fb0ddfb58613239273bae0a1dcf8039167a287af524f147819e5fd0e139a4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54c61e151396127b6acb95eaeb000470dd67dd517b271baa8fd58aaf664a2651
- 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:f121ad822f8d564f09432cf5a49380fa959d5dfa18afd45453784d9335e8839f
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c1451ddfda2bf2fad982ad02b761b0a4f34dca3123a387e3b252572fb630152
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-09-10-204736"
"base": "4.19.0-0.nightly-arm64-2025-09-11-084736"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600e0b8172e53bcba9628c2c4fbd4d0360f2f0d79ac9eeea7e92bf3574ecdebf",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-09-10-184745"
"base": "4.19.0-0.nightly-2025-09-14-165440"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f121ad822f8d564f09432cf5a49380fa959d5dfa18afd45453784d9335e8839f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b0fb0ddfb58613239273bae0a1dcf8039167a287af524f147819e5fd0e139a4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40618c352ebfdcbc5efd18b868e18d9b951897b0ea592ba17288ca2c14d73c71"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c1451ddfda2bf2fad982ad02b761b0a4f34dca3123a387e3b252572fb630152",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54c61e151396127b6acb95eaeb000470dd67dd517b271baa8fd58aaf664a2651",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c01d40c5bc89aaf3a5f035a62d5e20dc325d801120eec48d9e2b77165acf8"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-09-10-204736"
"base": "4.19.0-0.nightly-arm64-2025-09-11-084736"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38913bedaaea48bdcd85640d60139d2f09ede106ff5f4662c756fb543ac88ed8",
Expand Down
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-09-10-184745"
"base": "4.19.0-0.nightly-2025-09-14-165440"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47af8f418fa8d7f5fa2cdb3dcccd5329c96565e38edcb680d938dfa8df609270",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8346b755f20da14f192278b33cc68fbe777df45cb03fd0ebc1ce1758508b9899",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95c7a4bd33861a6c91bff8b032a0c7156a9a07f8e590a118a615d1b7c9f34fab",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40618c352ebfdcbc5efd18b868e18d9b951897b0ea592ba17288ca2c14d73c71",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2658fd8e2c1b4e6ca1be1cca0889b81b9674116f76842955a7cc1796aada5361",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67e6fd7d6b45d7f21a8f8d0a7454f97b8ba121147468f77d5d5b0c56189b43e9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b2fbad5f4c87d2bdef2398cd9bf9080da12331892bcc8a539cafeb53c1df9bd",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cf08523f756637d793561e66def0eda626c63abceb46e25209e2afedd59270f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e38d9844b162b7f4c8a995b46ce5a32dc646b9a62eab7bb2daaa0f948ea26e4d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f42330ab623bcda79d053d9629c4b43027e5f7dda0cf46daed939e8b9681a7be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c01d40c5bc89aaf3a5f035a62d5e20dc325d801120eec48d9e2b77165acf8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57f221b2a063f759a30cc8dc33857f03987a8af4dc029748477be31f7596b6ed",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d82155a75a6a17a6be0bc65ff5cdd8e4414746cbd637c26b4e7372427e15ad2",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33040296769eac0ad243e0b251267bae40356a88f259d4a99d96d6d0b7d41550",
"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:6541c71f1e68fd8a9fcb1b56e0928e6913504eb469a9fe8053cd45b0f88e761f"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bae654467a30ded49e29fc5331656a64f8847f56a76e99aad702f88c094f6d0"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
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:67e6fd7d6b45d7f21a8f8d0a7454f97b8ba121147468f77d5d5b0c56189b43e9"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d82155a75a6a17a6be0bc65ff5cdd8e4414746cbd637c26b4e7372427e15ad2"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
30 changes: 14 additions & 16 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
- api embedded-component 5b2b8cafdd825e60f37a3ce6f8dac0ad1732293e to 93b8cc2cf247366771a42d967d836f1968418540
- a9096507 2025-09-01T12:33:45+00:00 Add default value for MachineHealthCheck's maxUnhealthy to the description
- cluster-network-operator embedded-component bb6470c3cfbb1ecdaf78acac340e6a307bcd5231 to 9d49a4beb3693a53833a7af29e54567a97c2de2f
- 31df163 2025-09-09T16:22:06+00:00 Set maxUnavailable 10% on MultiNetworkPolicy DS

- kubernetes embedded-component 169f654a6b0bc3dcca620eda17240b86c578cb10 to b5229e8311fe15cd8e9a70de2279868726b19f84
- a3f04653a 2025-09-05T13:09:58-03:00 UPSTREAM: revert: 133264: Revert "remove failing test that depends on expired credential, remove credential, add TODOs"
- 6774035b9 2025-09-01T09:24:31-03:00 UPSTREAM: <carry>: Unrevert "Merge pull request #2412 from dusk125/rebase-v1.32.8""
- kubernetes embedded-component b5229e8311fe15cd8e9a70de2279868726b19f84 to 335be3a93cc6f48d84e5e6cd515ef748efb9664b
- 1d12f380f 2025-09-10T08:02:47+00:00 UPSTREAM: <carry>: Fix tests after backport
- 1cbed1808 2025-09-10T08:02:47+00:00 UPSTREAM: 131725: Avoid encoding in LogResponseObject when we are not going to use it
- ad91dd2ca 2025-09-10T08:02:47+00:00 UPSTREAM: 131694: Eliminate AuditContext`s SetEventLevel
- 4d0bfe23b 2025-09-10T08:02:47+00:00 UPSTREAM: 129472: Fix API server crash on concurrent map iteration and write

- operator-framework-olm embedded-component 5c83a8adfd3fb0a5b3f2f8a26d3d05eefd5ba9d0 to e42f5c26092b9dea5856807d314f57e1886d31d7
- 73f0b4d2 2025-09-06T17:59:56+02:00 UPSTREAM: <carry>: make downstream csv namespace labeler plugin e2e more resilient to race conditions
- 75dd5ea6 2025-09-06T17:56:04+02:00 Make PSA catalog tests more resilient (#3645)
- 15b1211b 2025-09-06T17:55:56+02:00 refactor ensure job to remove named parameters (#3644)
- machine-config-operator embedded-component 1a3a559a1c78f664e9812812c14e1b02687a96bc to 37499cebe4e30aea812eb2a0e0cb5ed9ee961c5f
- c4c77b67 2025-09-04T12:37:47-04:00 move mcn e2e tests from /test/e2e-techpreview/ to test/e2e/ to be part of the blocking test suite

- kubernetes image-amd64 169f654a6b0bc3dcca620eda17240b86c578cb10 to b5229e8311fe15cd8e9a70de2279868726b19f84
- a3f04653a 2025-09-05T13:09:58-03:00 UPSTREAM: revert: 133264: Revert "remove failing test that depends on expired credential, remove credential, add TODOs"
- 6774035b9 2025-09-01T09:24:31-03:00 UPSTREAM: <carry>: Unrevert "Merge pull request #2412 from dusk125/rebase-v1.32.8""

- kubernetes image-arm64 169f654a6b0bc3dcca620eda17240b86c578cb10 to b5229e8311fe15cd8e9a70de2279868726b19f84
- a3f04653a 2025-09-05T13:09:58-03:00 UPSTREAM: revert: 133264: Revert "remove failing test that depends on expired credential, remove credential, add TODOs"
- 6774035b9 2025-09-01T09:24:31-03:00 UPSTREAM: <carry>: Unrevert "Merge pull request #2412 from dusk125/rebase-v1.32.8""
- kubernetes image-amd64 b5229e8311fe15cd8e9a70de2279868726b19f84 to 335be3a93cc6f48d84e5e6cd515ef748efb9664b
- 1d12f380f 2025-09-10T08:02:47+00:00 UPSTREAM: <carry>: Fix tests after backport
- 1cbed1808 2025-09-10T08:02:47+00:00 UPSTREAM: 131725: Avoid encoding in LogResponseObject when we are not going to use it
- ad91dd2ca 2025-09-10T08:02:47+00:00 UPSTREAM: 131694: Eliminate AuditContext`s SetEventLevel
- 4d0bfe23b 2025-09-10T08:02:47+00:00 UPSTREAM: 129472: Fix API server crash on concurrent map iteration and write

8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component ddd7873
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 80c1fc3d81e3392ef7b056c8833185c8bdf6f599
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 3dfbb67635ce056fd55c360937be9868a3cf8ad5
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 8740a60de76690a17d5081db078eb93dfdb7a066
https://github.com/openshift/cluster-network-operator embedded-component bb6470c3cfbb1ecdaf78acac340e6a307bcd5231
https://github.com/openshift/cluster-network-operator embedded-component 9d49a4beb3693a53833a7af29e54567a97c2de2f
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a
https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01
https://github.com/openshift/csi-external-snapshotter embedded-component ac82cafc95b301f67f46ee0db93720d55177a19b
https://github.com/openshift/etcd embedded-component eb0acd5c92a830da18d7d0d789f7a8ecac860620
https://github.com/openshift/kubernetes embedded-component b5229e8311fe15cd8e9a70de2279868726b19f84
https://github.com/openshift/kubernetes embedded-component 335be3a93cc6f48d84e5e6cd515ef748efb9664b
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component fdef30c84b3d45ede364500984221c3f492b1415
https://github.com/openshift/machine-config-operator embedded-component 1a3a559a1c78f664e9812812c14e1b02687a96bc
https://github.com/openshift/machine-config-operator embedded-component 37499cebe4e30aea812eb2a0e0cb5ed9ee961c5f
https://github.com/openshift/openshift-controller-manager embedded-component 5b3063ff149f290bebca0783fc508dfbf07689a5
https://github.com/openshift/operator-framework-olm embedded-component e42f5c26092b9dea5856807d314f57e1886d31d7
https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 ac82cafc95b301
https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6
https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97
https://github.com/openshift/ovn-kubernetes image-amd64 6ff66743c4fbd0c413cf4bb9933a1eb510aa42e4
https://github.com/openshift/kubernetes image-amd64 b5229e8311fe15cd8e9a70de2279868726b19f84
https://github.com/openshift/kubernetes image-amd64 335be3a93cc6f48d84e5e6cd515ef748efb9664b
https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7
https://github.com/openshift/oc image-arm64 298429ba9831d1d72b89edd9beb82a6ee665c3b7
https://github.com/openshift/coredns image-arm64 4f64931403bf747b78bccb40ad877b08da534e23
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
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-09-10-184745" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-09-10-204736"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-09-14-165440" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-09-11-084736"