Skip to content
Closed
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=33
KUBE_GIT_VERSION=v1.33.4
KUBE_GIT_COMMIT=679fad59c6fcb6cd86bccb25ac702ec10d5ea15b
KUBE_GIT_COMMIT=95b8140e3a53ffc6aab114c39e07a439dfdf7f9e
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.21.0-0.nightly-arm64-2025-09-15-144433
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-09-20-145748
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.21.0-0.nightly-2025-09-15-042343
OCP_VERSION := 4.21.0-0.nightly-2025-09-19-012417
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.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:dee3513bfeee4ff391ee975b3e850027a913b32896aa2edd701dee92eb96a0d2
digest: sha256:2cd4dc33075a0ce98d1e81f8fe2b27c6f1da48e9d5d39ac7b019229db90d61f3
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:73860bbfc3f2264848baaf3de73196b06dd0c20123d129bc49a536e30fa384d9
digest: sha256:ff955c494b21172f285200eed204e692b8cc4bbe86068a3b3acbfeea5611dcb3
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:8a30db38bdb1fcb20eeaf810f8e51e7f963ef5645b4cf95d38b61c382a218bf1
digest: sha256:0719a66144b744eff9a1f8f5f7ccc029d190f4652ccbceed0fa12dd2b8a526d0
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0c1d4a990009171aa1881bded5535eae6400f31eb9cd44af4c6dddc454d24f8d
digest: sha256:19a4d5eb5ffad99144302bab9006895cffce382080b7a9a2fc9b5d478636118b
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-20-145748"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee3513bfeee4ff391ee975b3e850027a913b32896aa2edd701dee92eb96a0d2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73860bbfc3f2264848baaf3de73196b06dd0c20123d129bc49a536e30fa384d9"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2cd4dc33075a0ce98d1e81f8fe2b27c6f1da48e9d5d39ac7b019229db90d61f3",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff955c494b21172f285200eed204e692b8cc4bbe86068a3b3acbfeea5611dcb3"
}
}
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.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-19-012417"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a30db38bdb1fcb20eeaf810f8e51e7f963ef5645b4cf95d38b61c382a218bf1",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1d4a990009171aa1881bded5535eae6400f31eb9cd44af4c6dddc454d24f8d"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0719a66144b744eff9a1f8f5f7ccc029d190f4652ccbceed0fa12dd2b8a526d0",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a4d5eb5ffad99144302bab9006895cffce382080b7a9a2fc9b5d478636118b"
}
}
2 changes: 0 additions & 2 deletions assets/controllers/kube-controller-manager/defaultconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ extendedArguments:
# Most upstream clusters don't care about SELinux, therefore this controller is opt-in. OCP cares.
# Owner: OCP storage team, @jsafrane.
- "selinux-warning-controller"
cloud-provider:
- "external"
cluster-signing-duration:
- "720h"
secure-port:
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.aarch64.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:8fb1041934c9d683906359b524d6fc2c37d576ba2cf7f2698bcc238377fdd60d
digest: sha256:fd3f282e344a62e8e50c656c8eeffd94ad1994d6ee6d1b499ef573b3a1105d68
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:b34cceb99dc3feda980ce47b49887c06f4df7fa342116470112b521ea9905e5c
digest: sha256:579115709c542137cab2ea08c59f4ab053a720a4baf1c5c44d1b0f531c43de63
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-20-145748"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb1041934c9d683906359b524d6fc2c37d576ba2cf7f2698bcc238377fdd60d"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd3f282e344a62e8e50c656c8eeffd94ad1994d6ee6d1b499ef573b3a1105d68"
}
}
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.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-19-012417"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b34cceb99dc3feda980ce47b49887c06f4df7fa342116470112b521ea9905e5c"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:579115709c542137cab2ea08c59f4ab053a720a4baf1c5c44d1b0f531c43de63"
}
}
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:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac
digest: sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87
digest: sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6
digest: sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b

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:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1
- 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:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc
target:
kind: Deployment
labelSelector: app=catalog-operator
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:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff
digest: sha256:1d609fb68b5621bcd1fb216a1f10a326d22acee9f451de7b4c41ceb390987e77
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0
digest: sha256:9aa2d72d8d4150ec247788e0d4cf0123345cbe2968b4f45115f83dbf67cd49b6
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a
digest: sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6

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:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9aa2d72d8d4150ec247788e0d4cf0123345cbe2968b4f45115f83dbf67cd49b6
- 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:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d609fb68b5621bcd1fb216a1f10a326d22acee9f451de7b4c41ceb390987e77
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-20-145748"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4371229f0eb432f2631095ef32007fc90c132f9ff7a3128e8bfdea34cb3e07cc",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14234d64d169cd76916530e8e126a0584684b76a01cdd63c81421da9c504f7d1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-19-012417"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d609fb68b5621bcd1fb216a1f10a326d22acee9f451de7b4c41ceb390987e77",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9aa2d72d8d4150ec247788e0d4cf0123345cbe2968b4f45115f83dbf67cd49b6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-20-145748"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a61692bef1caed795671449fe24e458cee1bad4b9092738068f4ede1ab493626",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c20707204befd67334c2d4c98de152aeff159bce34f36b9268a40132ad71a18",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1cd7e11630b921bb61f89637861e16bf6169e42d7321313682e6828f736ca89",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1bd64ae838592c0ca3b924bda35f2b6a978dc3393035088acfc7d2b2fdd28e5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:190e85b5622ccf749c3acdf038bf1c490fe8ff3e760c3c657c51429895e774ce",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7baa77638952979e20e738a7e0783db32a445391e4d4f2631c4bbe859bcdbc04",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce0d25472b0f774efa0338b48cb9f595f5c6cc77a3af38c2f927483c03160819",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f049f67d64869428ffe8b3b63c2a9a423fc016f5950772d5aab6edfc299d237e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0c8624075be315462b24c7d26f0e4ed2a646f5391324284a8f13a9ed8eaaed",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52f95efe8c3580649ab226a048510143191a21771e4f41e0be545736576f176b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3b9f80e229b80a8f0c30442c7b63db7342ee9b6d9fb0e1571c216045b418d29",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e3f6b8d5389921b48df4b81afe2f69703c457207e380143e8a8929987c620f40",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83f01ddcb6769ca390d2d9b37bebd09866b8ba3583f5d7685e0e8bf23d9749c1",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08632df50d31f2b0d9b5a0b97ebe69365f2a31c7312a3181134c0d1b87c35551"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf4fa06135074add7898adb42a280c7324937cb8bddc22f2e14bfd5d86226e29"
}
}
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.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-19-012417"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c40b050f84d02171c29c25b0b9adf4e650df4ebdfc00a68e1217c4733dec6c3c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:501531f6b82acb64efc87d7d7aaaa9969a5683e003ab45e5e767d30723dad602",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e184887a22b45486c67979e1ffdc280e66e6edf50e35f1c934f38861d4a9a1f7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13a0b05bb986146e903bdb19edeea91bbfd17c69ba3af2177b09e3ea6468c8cb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba5d464bb715c7e03e2dcc144de10d7018f3b282afb9ca7362793457c8e6c62",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb39a09d251987144e08d066366dcb71530364089874bc7bc758e64a86bb625",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71d4467239a45093b768070b6bf4459fd3f6b76c39ac060c693f90ee0b49a17a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:011884062ded852ff4ab394884334bcd6dc742441ba2aa9f71a58b5ea8921022",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaf0ee390bd02dcf7102d331b720f2070e7e2eb7a08c2d31ec8ea27bd5d88997",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6634e031f549079832bfc4182a28b2e488ec01ad04285be1b95ad740cae91ce9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a10adc59bc9e78b0f585016f45ff71a7b5bc1862895f72bf7dc8e461a5528ad",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d64f615b78fb120046458c6f2309796b0c537ad0c83092fb1b207993f3790a7e",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ca70604107d666011271f5b3c109a12ddb334017d25eae853769c3b3c1620af"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:292e6b782caa72d44f558f288ea30cd95b2f1c3e93a7693bbb69783d9e832a32"
}
}
Loading