Skip to content
Open
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=35
KUBE_GIT_VERSION=v1.35.3
KUBE_GIT_COMMIT=872bd3722d0954b31459f715fbd4fb7612aaf338
KUBE_GIT_COMMIT=d8d517e6bbe7cf7359026cac26bb96ea45e18806
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 := 5.0.0-0.nightly-arm64-2026-06-10-025037
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-19-034904
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-06-09-112600
OCP_VERSION := 5.0.0-0.nightly-2026-06-18-000016
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:12f6644c521588d72e607d5761c7fa3e9a73bb0aab88b08420a8c5e4d4236ec5
digest: sha256:559deea32b9f6bea46f875c3f7ef5aeb599d82c2200bb69001aaa9392cf159c0
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:fc47b7c1f5138b74498c9c7ce7ad845f8fe73aa51fed2c735d6ebfa8882545a3
digest: sha256:6a53a8b286d211bfd60777c65c0c9fc1af826098b3f4efe3b81feabc68c3866d
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:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d
digest: sha256:eff2622ebea71d70f23b98a575163ace705dadde13c6fce7f76b56a43695b168
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72
digest: sha256:55fc72faf4c19e112deb552adc957f23fd969be1b58ac8b0f304876fe30ae424
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-06-10-025037"
"base": "5.0.0-0.nightly-arm64-2026-06-19-034904"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:12f6644c521588d72e607d5761c7fa3e9a73bb0aab88b08420a8c5e4d4236ec5",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc47b7c1f5138b74498c9c7ce7ad845f8fe73aa51fed2c735d6ebfa8882545a3"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:559deea32b9f6bea46f875c3f7ef5aeb599d82c2200bb69001aaa9392cf159c0",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6a53a8b286d211bfd60777c65c0c9fc1af826098b3f4efe3b81feabc68c3866d"
}
}
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-06-09-112600"
"base": "5.0.0-0.nightly-2026-06-18-000016"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:457d82310a2ecd6823e5eb2a1650d14443c2730ecda4d62ad8b88d181f63463d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:db6025036ff280675e8d784ab0457acfcfa29ec4af35e823e64f04901d39da72"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:eff2622ebea71d70f23b98a575163ace705dadde13c6fce7f76b56a43695b168",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:55fc72faf4c19e112deb552adc957f23fd969be1b58ac8b0f304876fe30ae424"
}
}
43 changes: 40 additions & 3 deletions assets/components/ovn/multi-node/master/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,46 @@ spec:
containerPort: {{.OVN_SB_PORT}}
terminationMessagePolicy: FallbackToLogsOnError

# ovnkube cluster-manager: allocates subnets to nodes, handles cluster-wide IPAM
- name: ovnkube-cluster-manager
image: {{ .ReleaseImage.ovn_kubernetes_microshift }}
command:
- /bin/bash
- -c
- |
set -xe
if [[ -f "/env/_master" ]]; then
set -o allexport
source "/env/_master"
set +o allexport
fi

echo "$(date -Iseconds) - starting ovnkube-cluster-manager, Node: ${K8S_NODE}"
exec /usr/bin/ovnkube \
--init-cluster-manager "${K8S_NODE}" \
--config-file=/run/ovnkube-config/ovnkube.conf \
--loglevel "${OVN_KUBE_LOG_LEVEL}" \
--enable-multicast
env:
- name: OVN_KUBE_LOG_LEVEL
value: "4"
- name: K8S_NODE
valueFrom:
fieldRef:
fieldPath: spec.nodeName
volumeMounts:
- mountPath: /run/ovnkube-config/
name: ovnkube-config
- mountPath: {{.KubeconfigDir}}
name: kubeconfig
- mountPath: /env
name: env-overrides
Comment thread
coderabbitai[bot] marked this conversation as resolved.
resources:
requests:
cpu: 10m
memory: 10Mi
terminationMessagePolicy: FallbackToLogsOnError
Comment on lines +356 to +394

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

Avoid inheriting host networking without hardening this new container.

This new container only mounts config/env, but it is added to a pod with hostNetwork: true and has no explicit restricted securityContext, limits, or probes. Split it into a restricted workload if host networking is not required; otherwise document the exception and add the missing hardening.

As per coding guidelines, "No hostPID, hostNetwork, hostIPC, privileged: true", "securityContext: runAsNonRoot, readOnlyRootFilesystem, allowPrivilegeEscalation: false", "Drop ALL capabilities", "Resource limits (cpu, memory) on every container", and "Liveness + readiness probes defined" are required.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/components/ovn/multi-node/master/daemonset.yaml` around lines 356 -
392, The ovnkube-cluster-manager container is running in a pod with hostNetwork:
true but lacks required security hardening. Add a securityContext block to this
container with runAsNonRoot: true, readOnlyRootFilesystem: true, and
allowPrivilegeEscalation: false; add a capabilities section to drop ALL
capabilities; add resource limits (both cpu and memory limits in addition to the
existing requests); and add both liveness and readiness probes with appropriate
initial delays and timeouts. If hostNetwork is not actually required for this
container's operation, consider moving it to a separate restricted deployment or
pod without host networking to minimize the security surface.

Source: Coding guidelines


# ovnkube master: convert kubernetes objects in to nbdb logical network components
- name: ovnkube-master
image: {{ .ReleaseImage.ovn_kubernetes_microshift }}
Expand All @@ -376,10 +416,7 @@ spec:

echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-master - start ovnkube --init-master ${K8S_NODE}"
exec /usr/bin/ovnkube \
--init-cluster-manager "${K8S_NODE}" \
--init-ovnkube-controller "${K8S_NODE}" \
--nb-address "{{.OVN_NB_DB_LIST}}" \
--sb-address "{{.OVN_SB_DB_LIST}}" \
--config-file=/run/ovnkube-config/ovnkube.conf \
--loglevel "${OVN_KUBE_LOG_LEVEL}" \
${gateway_mode_flags} \
Expand Down
2 changes: 0 additions & 2 deletions assets/components/ovn/multi-node/node/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ spec:
echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-node - start ovnkube --init-node ${K8S_NODE}"
exec /usr/bin/ovnkube \
--init-node "${K8S_NODE}" \
--nb-address "{{.OVN_NB_DB_LIST}}" \
--sb-address "{{.OVN_SB_DB_LIST}}" \
--config-file=/run/ovnkube-config/ovnkube.conf \
--loglevel "${OVN_KUBE_LOG_LEVEL}" \
--allow-no-uplink \
Expand Down
45 changes: 41 additions & 4 deletions assets/components/ovn/single-node/master/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,46 @@ spec:
memory: 10Mi
terminationMessagePolicy: FallbackToLogsOnError

# ovnkube cluster-manager: allocates subnets to nodes, handles cluster-wide IPAM
- name: ovnkube-cluster-manager
image: {{ .ReleaseImage.ovn_kubernetes_microshift }}
command:
- /bin/bash
- -c
- |
set -xe
if [[ -f "/env/_master" ]]; then
set -o allexport
source "/env/_master"
set +o allexport
fi

echo "$(date -Iseconds) - starting ovnkube-cluster-manager, Node: ${K8S_NODE}"
exec /usr/bin/ovnkube \
--init-cluster-manager "${K8S_NODE}" \
--config-file=/run/ovnkube-config/ovnkube.conf \
--loglevel "${OVN_KUBE_LOG_LEVEL}" \
--enable-multicast
env:
- name: OVN_KUBE_LOG_LEVEL
value: "4"
- name: K8S_NODE
valueFrom:
fieldRef:
fieldPath: spec.nodeName
volumeMounts:
- mountPath: /run/ovnkube-config/
name: ovnkube-config
- mountPath: {{.KubeconfigDir}}
name: kubeconfig
- mountPath: /env
name: env-overrides
resources:
requests:
cpu: 10m
memory: 10Mi
terminationMessagePolicy: FallbackToLogsOnError
Comment on lines +298 to +336

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | 🏗️ Heavy lift

Avoid inheriting host namespaces without hardening this new container.

This new container only mounts config/env, but it is added to a pod with hostNetwork: true and hostPID: true, and has no explicit restricted securityContext, limits, or probes. Split it into a restricted workload if those host namespaces are not required; otherwise document the exception and add the missing hardening.

As per coding guidelines, "No hostPID, hostNetwork, hostIPC, privileged: true", "securityContext: runAsNonRoot, readOnlyRootFilesystem, allowPrivilegeEscalation: false", "Drop ALL capabilities", "Resource limits (cpu, memory) on every container", and "Liveness + readiness probes defined" are required.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@assets/components/ovn/single-node/master/daemonset.yaml` around lines 298 -
334, The ovnkube-cluster-manager container is running in a pod with host
namespaces (hostNetwork and hostPID) but lacks required security hardening. Add
a securityContext section to this container that includes runAsNonRoot set to
true, readOnlyRootFilesystem set to true, and allowPrivilegeEscalation set to
false. Additionally, add a capabilities drop for ALL, define both CPU and memory
resource limits (in addition to the existing requests), and include liveness and
readiness probes to meet the coding security guidelines.

Source: Coding guidelines


# ovnkube master: convert kubernetes objects in to nbdb logical network components
- name: ovnkube-master
image: {{ .ReleaseImage.ovn_kubernetes_microshift }}
Expand Down Expand Up @@ -335,9 +375,8 @@ spec:
# the functionality depends on ip_forwarding being enabled
fi

echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-master - start ovnkube --init-master ${K8S_NODE} --init-node ${K8S_NODE}"
echo "I$(date "+%m%d %H:%M:%S.%N") - ovnkube-master - start ovnkube --init-node ${K8S_NODE}"
exec /usr/bin/ovnkube \
--init-cluster-manager "${K8S_NODE}" \
--init-ovnkube-controller "${K8S_NODE}" \
--init-node "${K8S_NODE}" \
--allow-no-uplink \
Expand All @@ -346,8 +385,6 @@ spec:
${gateway_mode_flags} \
${gw_interface_flag} \
--inactivity-probe="180000" \
--nb-address "" \
--sb-address "" \
--enable-multicast \
--disable-snat-multiple-gws \
--single-node \
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:a65b0dcf06f57dd03e2569f33649f06bc51f0845ceea01ecb141b76eaea485c1
digest: sha256:8639c41af3487c28275e94450b27a7c62ca2df26ba9e1b9bc3a4476ea06836fe
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:15d824e3b808602a5b4257a9aa51a807745754a46322c43ba4ba01ee56d73818
digest: sha256:093f0ff21decec40f02ea27a40fdab4834355b0938f156ee1636ce2e36d8fb2e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:6f5dc0bdcbb044810e7b09b01f80df866b3c3af938bd150d818c2914344fb4b2
digest: sha256:486787c72634c5413731f0bbfc5f26351abf20de8e56e7f52d131740e12b1cb3

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:15d824e3b808602a5b4257a9aa51a807745754a46322c43ba4ba01ee56d73818
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:093f0ff21decec40f02ea27a40fdab4834355b0938f156ee1636ce2e36d8fb2e
- 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:a65b0dcf06f57dd03e2569f33649f06bc51f0845ceea01ecb141b76eaea485c1
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8639c41af3487c28275e94450b27a7c62ca2df26ba9e1b9bc3a4476ea06836fe
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:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b
digest: sha256:ef956b49fd9d0a45d3ba02bcbf3b0ab90ed8f81411ee2e15c0c763bbf1707317
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690
digest: sha256:ab7a0c9c6245cb66f3219f4fe9186ccb6e21c0d2c71c1634d2e0da099c165c0b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
digest: sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d
digest: sha256:425ef32d3424933f2364d25fb46ab603d7f0369e98a9fd6a345acb1164cdd2a9

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:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ab7a0c9c6245cb66f3219f4fe9186ccb6e21c0d2c71c1634d2e0da099c165c0b
- 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:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ef956b49fd9d0a45d3ba02bcbf3b0ab90ed8f81411ee2e15c0c763bbf1707317
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-06-10-025037"
"base": "5.0.0-0.nightly-arm64-2026-06-19-034904"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a65b0dcf06f57dd03e2569f33649f06bc51f0845ceea01ecb141b76eaea485c1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:15d824e3b808602a5b4257a9aa51a807745754a46322c43ba4ba01ee56d73818",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6f5dc0bdcbb044810e7b09b01f80df866b3c3af938bd150d818c2914344fb4b2"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8639c41af3487c28275e94450b27a7c62ca2df26ba9e1b9bc3a4476ea06836fe",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:093f0ff21decec40f02ea27a40fdab4834355b0938f156ee1636ce2e36d8fb2e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:486787c72634c5413731f0bbfc5f26351abf20de8e56e7f52d131740e12b1cb3"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "5.0.0-0.nightly-2026-06-09-112600"
"base": "5.0.0-0.nightly-2026-06-18-000016"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1e28d2b718e7ad024fd6ac20e5ec4ac5e30ebcc81c136b0c733165a47483625b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cae1efda5b44d38b54fbc0fa7acee126a8334b4af380691f8c05981d27afb690",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ef956b49fd9d0a45d3ba02bcbf3b0ab90ed8f81411ee2e15c0c763bbf1707317",
"operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ab7a0c9c6245cb66f3219f4fe9186ccb6e21c0d2c71c1634d2e0da099c165c0b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:425ef32d3424933f2364d25fb46ab603d7f0369e98a9fd6a345acb1164cdd2a9"
}
}
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-06-10-025037"
"base": "5.0.0-0.nightly-arm64-2026-06-19-034904"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:335cc4f16ae535d0d2e72206f63bba97db6c7f3d7ae8896842e179548e1db76b",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9c3900c948954ad3c9206147f75a9cd3039e6e95947f4bf82ee994db9317202a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b3308350dc53d829dcdad213454159c207ecc634dd2378db4916dea3614c9c9c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6f5dc0bdcbb044810e7b09b01f80df866b3c3af938bd150d818c2914344fb4b2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:59eba69120cff661709251ed6c21cc5b53ec8f288b5576014f8d893705153e99",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:56ac733f8a19c57d0027aba6bebd7063d85f1cf1b6f474c0180cd8f7d862c71f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cbcbf4bacdc37322bfa70addad27cbc09d1d57dae05e0be5c0bdbab27fd4edc3",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9171ae39c9e75541786022580c12ca4f6db626f281b2b8a52eda9fcfd282ef09",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:8b544070e2f4c9d7ad45088fbe70aa7ae55a9cef62b4491bca8fabee0a2ba103",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c47e4b6043133e0ebbe5964383513e9932720c699f95a7b9c4d2fc16a8b76121",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:486787c72634c5413731f0bbfc5f26351abf20de8e56e7f52d131740e12b1cb3",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:19da252fc46f4c73fced39bd74b2b83897d98eb17ee475bd17dab30b9e78d762",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:30665ad20778e682dda0f17d0cbfdebde2cd3405baad20ec1f5079eab3583278",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ca744ab369ba2b611c79fc0383696b204ce3acdb8612831fe6f3ae3450ebc3eb",
"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:a1d1ef4683809a939a4c7e44d459e141c9c1be5808bfba303fd7a422373a5070"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cfc74ac04331b1114a76f256f92db3d8caea5778586e98e87b6c3a8dd70e2f1c"
}
}
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-06-09-112600"
"base": "5.0.0-0.nightly-2026-06-18-000016"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4e9157049bcb87590c356e522fb74ddb350b5f6e375f2007e36b20ecc841cd13",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3707f170213eda5d37f45c8f2f5605c3d4db80acd55f3b7943d90ad0248f8582",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:39fdc41a150c6665c192f1ec06563c5c1f7b8f65e8377a5e2d16cf495c5bca50",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cd84fae073953125e6eed47e7feacb146161df6d5222f5d899704686f917c50d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:78d59d56dd6fb55ffa858fc96f7e67193a28b3baac9cfca46ee1b6a1a4e1bca4",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0b69d8c02c7d6231928b1737e74ee30ade20bce70887b6c7c1d68ae034bc9dcd",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:065512cd13378b366cd1adad78b9047f099bd777dccd0dbb4a99f25f504381e4",
"cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9555e02d5df78c1c2df121d163577a0b41081e7134699f9721a9ade4b91873c5",
"coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3f8d0dc54f17a26b25dba87f9ad3ced992efd47585c652f9a137d20d77ced9ef",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:40028b8216c362e8e67596f58ce90e9f75c55efc0f245f27f2086de2066f1692",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:425ef32d3424933f2364d25fb46ab603d7f0369e98a9fd6a345acb1164cdd2a9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6fcff26611bf328bfe6f8afa3c3a8a9d9769152a03cba7c5472b39964b277519",
"pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:48e001d0cdcb2b16f701f501f755a243009642183ff8ca4b1de12e3bee88fd4d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0af6833a51a2dc20bf266a5e6ae86a9cbf5d46b48c2121b58ce0d1f7283c24f0",
"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:c254280d6a89ed1d0c570544fd1ae40e804fc3c81dc671d161e56bb922add9e9"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:0ee1f91dd0077f06274317a980ec4863c6b3e80f541c042e8cd0cd31277ccaef"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,16 @@ func main() {
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)},
})

// AddGlobalSuite so the umbrella starts with zero qualifiers and inherits
// exclusively from its children via mergeParentQualifiers in origin.
kubeTestsExtension.AddGlobalSuite(e.Suite{
Name: "kubernetes/conformance",
})

kubeTestsExtension.AddSuite(e.Suite{
Name: "kubernetes/conformance/parallel",
Parents: []string{
"kubernetes/conformance",
"openshift/conformance/parallel",
},
Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)},
Expand All @@ -81,6 +88,7 @@ func main() {
kubeTestsExtension.AddSuite(e.Suite{
Name: "kubernetes/conformance/serial",
Parents: []string{
"kubernetes/conformance",
"openshift/conformance/serial",
},
Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)},
Expand Down
Loading