Merge pull request #288 from abyrne55/OSD-20193-2

openshift-merge-bot[bot] · web-flow · commit 426092ea6601 · 2024-03-04T20:43:53.000Z
Add webhook service to HCP allowlist
diff --git a/build/resources.go b/build/resources.go
@@ -598,6 +598,9 @@ func createService() *corev1.Service {
 			},
 			Labels: map[string]string{
 				"name": serviceName,
+				// hosted-cluster-config-operator label for HOSTEDCP-1063 compliance,
+				// i.e., adding our webhook's service to the HCP webhook allowlist
+				"hypershift.openshift.io/allow-guest-webhooks": "true",
 			},
 			Name:      serviceName,
 			Namespace: *namespace,
diff --git a/build/selectorsyncset.yaml b/build/selectorsyncset.yaml
@@ -130,6 +130,7 @@ objects:
           service.beta.openshift.io/serving-cert-secret-name: webhook-cert
         creationTimestamp: null
         labels:
+          hypershift.openshift.io/allow-guest-webhooks: "true"
           name: validation-webhook
         name: validation-webhook
         namespace: openshift-validation-webhook
diff --git a/config/package/resources.yaml.gotmpl b/config/package/resources.yaml.gotmpl
@@ -16,6 +16,7 @@ metadata:
     service.beta.openshift.io/serving-cert-secret-name: webhook-cert
   creationTimestamp: null
   labels:
+    hypershift.openshift.io/allow-guest-webhooks: "true"
     name: validation-webhook
   name: validation-webhook
 spec:
diff --git a/pkg/config/namespaces.go b/pkg/config/namespaces.go
