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 := 5.0.0-0.nightly-arm64-2026-05-27-222818
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-04-190103
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 := 5.0.0-0.nightly-2026-05-27-205543
OCP_VERSION := 5.0.0-0.nightly-2026-06-04-190102
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-v5.0-art-dev
digest: sha256:9731df837f9dc3677bf2676d9a739eb12f76a38b1870a00792cd70e5dff9f03b
digest: sha256:d95acb85de525f3ed6c179c7c780245d7f50821d881f2c5c84c9f08c947d47b3
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:594456e4fd92b9e5fffd11f5748b358a245e56e31f76ce1fff844259073e2875
digest: sha256:5fed52311e3e769dbb5dc03067ce33c7de0c1308ee033310cc53f7203f7fbe5f
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-v5.0-art-dev
digest: sha256:0d60eed5435b727796d71713f0e4edae2f8cf009e0c5af2c42747a1b100dfd33
digest: sha256:d6d962ee038eac98ae9a7cb182052a79804740db2c03bfeedb0dd7196a894a62
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:bfe2abfc336ee1f26782da9ffafb878289292d7a1150b3e0cec6e13cca961aac
digest: sha256:51b0ac230b385565a5285a95b29ff48a65b7110445f7631b9888212329e7f165
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": "5.0.0-0.nightly-arm64-2026-05-27-222818"
"base": "5.0.0-0.nightly-arm64-2026-06-04-190103"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9731df837f9dc3677bf2676d9a739eb12f76a38b1870a00792cd70e5dff9f03b",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:594456e4fd92b9e5fffd11f5748b358a245e56e31f76ce1fff844259073e2875"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d95acb85de525f3ed6c179c7c780245d7f50821d881f2c5c84c9f08c947d47b3",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5fed52311e3e769dbb5dc03067ce33c7de0c1308ee033310cc53f7203f7fbe5f"
}
}
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": "5.0.0-0.nightly-2026-05-27-205543"
"base": "5.0.0-0.nightly-2026-06-04-190102"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0d60eed5435b727796d71713f0e4edae2f8cf009e0c5af2c42747a1b100dfd33",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bfe2abfc336ee1f26782da9ffafb878289292d7a1150b3e0cec6e13cca961aac"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d6d962ee038eac98ae9a7cb182052a79804740db2c03bfeedb0dd7196a894a62",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:51b0ac230b385565a5285a95b29ff48a65b7110445f7631b9888212329e7f165"
}
}
4 changes: 2 additions & 2 deletions assets/crd/route.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -558,13 +558,13 @@ spec:
- termination
type: object
x-kubernetes-validations:
- message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
rule: '!(has(self.certificate) && has(self.externalCertificate))'
- message: 'cannot have both spec.tls.termination: passthrough and
spec.tls.insecureEdgeTerminationPolicy: Allow'
rule: 'has(self.termination) && has(self.insecureEdgeTerminationPolicy)
? !((self.termination==''passthrough'') && (self.insecureEdgeTerminationPolicy==''Allow''))
: true'
- message: cannot have both spec.tls.certificate and spec.tls.externalCertificate
rule: '!(has(self.certificate) && has(self.externalCertificate))'
to:
description: |-
to is an object the route should use as the primary backend. Only the Service kind
Expand Down
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-v5.0-art-dev
digest: sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188
digest: sha256:d3328a007e3059145dc4261121a0dcb6c9c2f7f82aba8bed2dc7fe4442b44317
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae
digest: sha256:1fb113ed086cc02b16fcb089d0456ffd3faa917ad28ed669cad0b40b7bfe11b8
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc
digest: sha256:793a8dbe8247852c605ad6bebb039641eeef1a84842d7661a7ec3c8c2c8617fb

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1fb113ed086cc02b16fcb089d0456ffd3faa917ad28ed669cad0b40b7bfe11b8
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d3328a007e3059145dc4261121a0dcb6c9c2f7f82aba8bed2dc7fe4442b44317
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-v5.0-art-dev
digest: sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b
digest: sha256:5983a2a3a4a7505ef21024cb248c8b8011789eb51de8fc4fd0528df4b6652a9e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b
digest: sha256:83031211e6f9b1d120da82554fba373db194236cf7395058efaeb74bf7015e84
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529
digest: sha256:b2f55f068d30a61367962c5af6c43d399a5ecba5b1ba24749c2268131ba4ed98

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83031211e6f9b1d120da82554fba373db194236cf7395058efaeb74bf7015e84
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5983a2a3a4a7505ef21024cb248c8b8011789eb51de8fc4fd0528df4b6652a9e
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-arm64-2026-05-27-222818"
"base": "5.0.0-0.nightly-arm64-2026-06-04-190103"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62283e52d11c75defea93afdf86f8d50e8028155bde588b4d43298f7204c4188",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce7c9323a5e3e69503fa94cbf7089deffaa37fe4aeb949fdf3e6f227f8a93ae",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d3328a007e3059145dc4261121a0dcb6c9c2f7f82aba8bed2dc7fe4442b44317",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1fb113ed086cc02b16fcb089d0456ffd3faa917ad28ed669cad0b40b7bfe11b8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:793a8dbe8247852c605ad6bebb039641eeef1a84842d7661a7ec3c8c2c8617fb"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-05-27-205543"
"base": "5.0.0-0.nightly-2026-06-04-190102"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f415763ee0a7c205f5e6f11b4fa5aff0aaa0eda109288aaf8d123f6dba59d3b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:770b6bc7d12769e0fd835da058fc4d31c96cc7b6a6511d52ee9393ea6a81a17b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5983a2a3a4a7505ef21024cb248c8b8011789eb51de8fc4fd0528df4b6652a9e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:83031211e6f9b1d120da82554fba373db194236cf7395058efaeb74bf7015e84",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2f55f068d30a61367962c5af6c43d399a5ecba5b1ba24749c2268131ba4ed98"
}
}
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": "5.0.0-0.nightly-arm64-2026-05-27-222818"
"base": "5.0.0-0.nightly-arm64-2026-06-04-190103"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b09be655df91261f96df64a17c9af8754238f9de772e06c1af14fc2f7e8a2918",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:477b23e4acc6f370f1083ed2ff9d29800475b67d604aba5ef9dbcdede647d528",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8ce94c719d49cdc98b56a4595bbbff75721381e0e2432b4d93faa1e54793b2be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0053edf86c2a802a62a07af974324ad4f1aa37c5f85164255321d8bf676820fc",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c4e4917c83de2f90fa2ca0159cedc4b567cd43ea78e930cc545ae82bc20ab8ab",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:2d655ca263dd1cca079e6093e8d630cfb1c5badd8e4fe8ddf188e5c71e650701",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:098ad69386ec4e9523e604081d2e562cd0f93a6cbae18af46bbf290c02cf3b0a",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:55907bd20ec3842c334cf0226d4d28df82d4957f3f71213a574ad766da99cf17",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7c4e908fe93c8708a99301c9a0ef14759411f78e6c5a808fc596be08442827b2",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0e9dc401a27f987fd240c57853e762f3b27c433d7eb54d71e7ecad107cd9ed2f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:793a8dbe8247852c605ad6bebb039641eeef1a84842d7661a7ec3c8c2c8617fb",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:62054084006a6e09fd13a3f7dfcba6e31c87ef38cfe7e7d85d1531ca9bb8b056",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:bc19885aeb4dd9c3bb8157fa3f5fbb5e7b2e26eb221fbf9bdecbd93a1b454c2f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a8cd2a992324089c2a52ce09313c0442db7f6af34f65ec44e5ab63ea13e3ed2d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:851f03cc7e38750d55d9d526dd1b7ca5f4babc4ecf5860066a106c73ebe7c122"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:22423c0373c6bcfd931e95be278c6f74d7c4b36a0d7967662dca02cd86243b5b"
}
}
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": "5.0.0-0.nightly-2026-05-27-205543"
"base": "5.0.0-0.nightly-2026-06-04-190102"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5834bc2fe2f60d6ddcd1e52c3f3d6f542213cd97c06c4fe9a98de979fde6f772",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:521fdf9daae2a5e9427b1f337d6f7d574e1e07cba0fbedc5dcdecc200944b240",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0f5e8e002ada1f7adc0116b8393fdeacabfcc418924134a7f49fa55b4b298117",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:021ef755badbca515d58b612e314b021ef2f50312811c9721b1f4c5f2c6b8529",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:de7d3cab66356363569fe490cc954a1899ba008c17c12222cd44f5a0c93792e3",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:33402db6db336615409b979a031a8cae93b6141986df0d5bd60e2b44978daf63",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:64bdd7ad7048c1a3258e57f0182a37582404c3bcca5fb7b24314a0497d2c60b2",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:76b2782a71641225901307dee52db196138ce2fda3dd21214a7239a6c87c76cd",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:aee08a2b05d706e5fc35a9f2672207d86c15ce32126706f19a57f984004e289d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:42a9650f03b6db9f60ef77c7c86bd3ab26b45c8ccb6b60725812f7e145aecf95",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2f55f068d30a61367962c5af6c43d399a5ecba5b1ba24749c2268131ba4ed98",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:26cceed0404a6663a8b4c6b7770ca2331913ac20bed03a361d09c4a049386085",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c88bf8c8745f9140316f2be4fe922ece86ebd99083e7c5ee942540bcbee12c0a",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:44d9a33c6699de6a47288c50f87bda2a87859568ac4b1c11256959167cf27bfb",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3554be064fdbdc1255b5f09fcc2e1c28c126d03c4527cadf332d92ebd038d9c9"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b2ddaffd296f87873e3a2f1b486bad33b865eb03678e4a8d4ebc0616a8c475da"
}
}
18 changes: 18 additions & 0 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/config.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 78 additions & 2 deletions etcd/vendor/github.com/openshift/microshift/pkg/config/dns.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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 @@ -2,6 +2,6 @@
# 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-v5.0-art-dev@sha256:33402db6db336615409b979a031a8cae93b6141986df0d5bd60e2b44978daf63"
pause_image = "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c88bf8c8745f9140316f2be4fe922ece86ebd99083e7c5ee942540bcbee12c0a"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
Loading