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.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2026-04-22-223113
OCP_VERSION := 4.17.0-0.nightly-arm64-2026-04-25-100804
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.17.0-0.nightly-2026-04-20-052548
OCP_VERSION := 4.17.0-0.nightly-2026-04-25-093840
4 changes: 2 additions & 2 deletions assets/optional/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:71606b9db8dbc256a15cdad957cb73e2eb29a24204d7695e98d061827c6efe46
digest: sha256:e7f69323c16daacc285f4bb3220886201009e109791bb4c67b124548bdd51133
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:66a77b20fb86f3bcf0c9ce8dd378ce6454b30674faf6f53d4fa8a58a8893c738
digest: sha256:e4845e01b03e3ca7b28ead6a22477e3c36c3f5218e5c2c7cfd93666f6bdf3788
4 changes: 2 additions & 2 deletions assets/optional/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:b516b20f95f60b24a4b01ea98fd17823144f77dfa4412a087b8d6c9c228af5b8
digest: sha256:af137e8a85e7720f2af1aad333a34447d0c0d3e85bb350c6b064d1166d1e4d98
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fb5721c80d478d843f278300fdb72d606faf299ee1b51b48a9050b226903443b
digest: sha256:fc298a059f1990154a9443095f090432d3d4aa5686e3b5f33a68a0e0bb48d330
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-04-22-223113"
"base": "4.17.0-0.nightly-arm64-2026-04-25-100804"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71606b9db8dbc256a15cdad957cb73e2eb29a24204d7695e98d061827c6efe46",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66a77b20fb86f3bcf0c9ce8dd378ce6454b30674faf6f53d4fa8a58a8893c738"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7f69323c16daacc285f4bb3220886201009e109791bb4c67b124548bdd51133",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4845e01b03e3ca7b28ead6a22477e3c36c3f5218e5c2c7cfd93666f6bdf3788"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-2026-04-20-052548"
"base": "4.17.0-0.nightly-2026-04-25-093840"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b516b20f95f60b24a4b01ea98fd17823144f77dfa4412a087b8d6c9c228af5b8",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb5721c80d478d843f278300fdb72d606faf299ee1b51b48a9050b226903443b"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af137e8a85e7720f2af1aad333a34447d0c0d3e85bb350c6b064d1166d1e4d98",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc298a059f1990154a9443095f090432d3d4aa5686e3b5f33a68a0e0bb48d330"
}
}
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:48dc8f91a26c14702f96db2280e0005a3d46aa3cce271319fb6df14c201f80e2
digest: sha256:7570ba26b770a31d5d88a20812b2b4e79c7dd9a890b4df89d57a6ec258c36e35
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e73da5cf0c6b02f1b8560f23c0a8566be7650c5d020c2e0b2aabe42f11e62a18
digest: sha256:823a55ea62c10516e7a9efd63d923f595075c72aa7ec67ca6c8b9c3e9ad380c2
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6ac7ae0ed942b9f53ddb09e4467e461da8a180a5fda6786a89f56ac3e6777036
digest: sha256:f898076ef5e35332e6862874591a38ff01764788aae50e253b31efc791affbd6

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:e73da5cf0c6b02f1b8560f23c0a8566be7650c5d020c2e0b2aabe42f11e62a18
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:823a55ea62c10516e7a9efd63d923f595075c72aa7ec67ca6c8b9c3e9ad380c2
- 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:48dc8f91a26c14702f96db2280e0005a3d46aa3cce271319fb6df14c201f80e2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7570ba26b770a31d5d88a20812b2b4e79c7dd9a890b4df89d57a6ec258c36e35
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:050fd5cb044ab605ede5b63b035bb3a58715ec5d78043ee6808669657d24d8be
digest: sha256:525276cc148dc0cc3911c7877289f46a8f5b69a1ff68244e21df0eba56e2bfaf
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0f6bdaa5c3dbcbf4d7c4774cc64718ce4e3aefd70ae9fe275b3338e2a3d06d17
digest: sha256:73363d58eca230397801d2194c984f0c3c235ec2aeacc641d8bb6ddf77b3e178
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:da5ae900ea64087c58468b326d2a6beeaad630c7c3024a305be075d940be13e4
digest: sha256:1cfafa4dab7adbb47535471e9405eb6de096a31ae9546cf6334f4ea1312afc4d

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:0f6bdaa5c3dbcbf4d7c4774cc64718ce4e3aefd70ae9fe275b3338e2a3d06d17
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73363d58eca230397801d2194c984f0c3c235ec2aeacc641d8bb6ddf77b3e178
- 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:050fd5cb044ab605ede5b63b035bb3a58715ec5d78043ee6808669657d24d8be
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:525276cc148dc0cc3911c7877289f46a8f5b69a1ff68244e21df0eba56e2bfaf
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-04-22-223113"
"base": "4.17.0-0.nightly-arm64-2026-04-25-100804"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48dc8f91a26c14702f96db2280e0005a3d46aa3cce271319fb6df14c201f80e2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e73da5cf0c6b02f1b8560f23c0a8566be7650c5d020c2e0b2aabe42f11e62a18",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ac7ae0ed942b9f53ddb09e4467e461da8a180a5fda6786a89f56ac3e6777036"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7570ba26b770a31d5d88a20812b2b4e79c7dd9a890b4df89d57a6ec258c36e35",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:823a55ea62c10516e7a9efd63d923f595075c72aa7ec67ca6c8b9c3e9ad380c2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f898076ef5e35332e6862874591a38ff01764788aae50e253b31efc791affbd6"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-2026-04-20-052548"
"base": "4.17.0-0.nightly-2026-04-25-093840"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:050fd5cb044ab605ede5b63b035bb3a58715ec5d78043ee6808669657d24d8be",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f6bdaa5c3dbcbf4d7c4774cc64718ce4e3aefd70ae9fe275b3338e2a3d06d17",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da5ae900ea64087c58468b326d2a6beeaad630c7c3024a305be075d940be13e4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:525276cc148dc0cc3911c7877289f46a8f5b69a1ff68244e21df0eba56e2bfaf",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73363d58eca230397801d2194c984f0c3c235ec2aeacc641d8bb6ddf77b3e178",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cfafa4dab7adbb47535471e9405eb6de096a31ae9546cf6334f4ea1312afc4d"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-04-22-223113"
"base": "4.17.0-0.nightly-arm64-2026-04-25-100804"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a56aa35f6ff96329c4772604e191097411c601f09102f0a2509e851de815cb",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb2f355feeabd01d816218be9980b13edf1acc9d5db8c4edbe7009a3358732b4",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c8dd971d6743ead51dc528f36ce53eab46a2aae9127826ae59c436f1e8cd4558",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ac7ae0ed942b9f53ddb09e4467e461da8a180a5fda6786a89f56ac3e6777036",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b32d6e670be183e91c23abad9982bc9daec807860a27f7336724943830024ff",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1aa0f8a1f274d1efb921f8ae11d5c48287b645c967a0340396a2be7dcf3efe26",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50a2ec61c5457132ddc731a81cf656a9d1874447c30f802c2e220ee959cb3ac7",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d080fed44fb05f0f6784ea1313b2cb9ad4754909e1644b7935d4cb2cd0ed8f6",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04129ce3245169695f884b45cac16cd0b17a4b3537569a0604fcc6dbb619c787",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93eac82ff6d3873fc04feb59c309a47294ef48af71a78a601f3ec787fb86a95",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f898076ef5e35332e6862874591a38ff01764788aae50e253b31efc791affbd6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0caf630139ddd683d3cdb1dc925e8c62f86a98fe58c3c371326e4d97f05db570",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee2513de7e88991823da472bb0c6838d5dc258ad99f7fcd0ae057dffffd177d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf6cc78f4efc6fe611eadaae47f7ee20f2f7ac175892c684d2dcad362dd8fad6",
"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:d41eac782cf1fd20e78139d10be7ffb08f80552a694fb004be5b726a502c5f90",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e0fead23ba01772f5d4bbc9247bb32a153fc7b0936243eb9983de64af10f083"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1eb170c3c668698ba75939a739834803a766e5ff6de1a15a408c9ff2c14a1ab",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5e32fbb910b7a2dee59b838f8adf0d49e148911b2beb53f037742791988a1b9"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-2026-04-20-052548"
"base": "4.17.0-0.nightly-2026-04-25-093840"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:514034cb93eaecc913bd9dcc725e3b0f6ff04f8475461e54a6fda10eef5e0fab",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41d6d82fc2aabcf56ea447cf6788f0d4773f8d1554e52f94ab24a74c61044c98",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bc5f4d8b5483341f511acef4dbc4a856f3a4fce6b9a1b9fab7ab132d201b9a4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da5ae900ea64087c58468b326d2a6beeaad630c7c3024a305be075d940be13e4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89d2b2e96c0e17426a572dc0be4d0163c6d7ec6f952796bd7eefb27939e1c8bc",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1dab6f4cd55c91a6a13ef66aeb823577b18e5922348eddf290ceb04dc9f781c8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b456f135292d348510b5eaddcd4f70886305f7a2de43aa51a3f166ed1d32db35",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9749f19fa26959b571893f6de4d3fc6a4ac1e7f0f1549f358501aac4239e0786",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e7e007423653d33fd09b1927bcb180576d2eed27e9350cdbef867e21d68de3b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5ba5621f990af0e04fca1b7f6258f73c0439487045346e220fb50a461e7ab57",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cfafa4dab7adbb47535471e9405eb6de096a31ae9546cf6334f4ea1312afc4d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e71a794c8b036aa340c49c128517274a54246bca4cf9695f508ab1ea60397fb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93c96171800eac1f31abadff4dc30dc6e41a1c1f000627caab5fb9981b544019",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a50a36b2b5142575a7348e836adaef46efb9e56ec15fb52fc3db11ee99d67a53",
"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:00c4de0203c2dbe47ce5adf1a059f5f1df1f60514b45fee398b2f3649576af2d",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ceb7ae472724e94152c6e0a7ffb06b611fd7fbf6acd29b25fe5df95102e9e7c"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73d360bcb71e7f1478e4919d6e5a8d4405246dff273db803a5909283e033e264",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b6aad00fd893dfd346d89099f70727abea4cac58260bc75ba630db4616ce2ee"
}
}
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 @@ -25,6 +25,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:1dab6f4cd55c91a6a13ef66aeb823577b18e5922348eddf290ceb04dc9f781c8"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:93c96171800eac1f31abadff4dc30dc6e41a1c1f000627caab5fb9981b544019"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,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:1aa0f8a1f274d1efb921f8ae11d5c48287b645c967a0340396a2be7dcf3efe26"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee2513de7e88991823da472bb0c6838d5dc258ad99f7fcd0ae057dffffd177d"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
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.17.0-0.nightly-2026-04-20-052548" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-04-22-223113"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2026-04-25-093840" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-04-25-100804"