From 2a218cfe2065d58a642fa6ca124201c26cf9c145 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Wed, 11 Oct 2023 11:29:12 -0400 Subject: [PATCH 1/2] OCPBUGS-20164: Capability Annotation for Build CRD Add missing `capability.openshift.io/name` annotation to the Build cluster configuration CRD. This will ensure that the config object for the Build sub-system is not created when the Build capability is not enabled. --- config/v1/0000_10_config-operator_01_build.crd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/v1/0000_10_config-operator_01_build.crd.yaml b/config/v1/0000_10_config-operator_01_build.crd.yaml index 75166deb7c1..9e80775ffef 100644 --- a/config/v1/0000_10_config-operator_01_build.crd.yaml +++ b/config/v1/0000_10_config-operator_01_build.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.openshift.io: https://github.com/openshift/api/pull/470 + capability.openshift.io/name: Build include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" From bc81d149d1c382ddba9ee1638d92c06cbd837fa9 Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Wed, 11 Oct 2023 16:35:01 -0400 Subject: [PATCH 2/2] Add capability to payload command Annotate the Build CRD so that it is linked with the appropriate cluster capability in the payload empty-resources. --- .../empty-resources/0000_05_config-operator_02_build.cr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml b/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml index a6dab5dc1f4..c32b468b076 100644 --- a/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml +++ b/payload-command/empty-resources/0000_05_config-operator_02_build.cr.yaml @@ -3,6 +3,7 @@ kind: Build metadata: name: cluster annotations: + capability.openshift.io/name: Build include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true"