fixed ca injection patch

Author: kpiyush17

spectro/generated/webhook-manifests.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -202,7 +202,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -736,7 +736,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -1008,7 +1008,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -1298,7 +1298,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -2074,7 +2074,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -2239,7 +2239,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack
@@ -2917,7 +2917,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-webhook-service
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
     controller-gen.kubebuilder.io/version: v0.16.5
   labels:
     cluster.x-k8s.io/provider: infrastructure-cloudstack

spectro/webhook/certificate_patch.yaml

@@ -1,17 +1,13 @@
 # Adds namespace to all resources.
 namespace: capi-webhook-system
-# Value of this field is prepended to the
-# names of all resources, e.g. a deployment named
-# "wordpress" becomes "alices-wordpress".
-# Note that it should also match with the prefix (text before '-') of the namespace
-# field above.
-namePrefix: capc-
 
 # Labels to add to all resources and selectors.
 labels:
 - pairs:
     cluster.x-k8s.io/provider: "infrastructure-cloudstack"
 
+namePrefix: capc-
+
 resources:
   - ../../config/crd
   - ../../config/manager
@@ -22,16 +18,18 @@ resources:
 vars:
 - name: CERTIFICATE_NAMESPACE
   objref:
-    kind: Service
+    kind: Certificate
+    group: cert-manager.io
     version: v1
-    name: webhook-service
+    name: serving-cert
   fieldref:
     fieldpath: metadata.namespace
 - name: CERTIFICATE_NAME
   objref:
-    kind: Service
+    kind: Certificate
+    group: cert-manager.io
     version: v1
-    name: webhook-service
+    name: serving-cert
   fieldref:
     fieldpath: metadata.name
 - name: SERVICE_NAMESPACE # namespace of the service
@@ -52,7 +50,6 @@ configurations:
 patches:
 - path: manager_webhook_patch.yaml
 - path: webhook_ca_injection_patch.yaml
-- path: certificate_patch.yaml
 - target:
     kind: Deployment
     name: controller-manager

spectro/webhook/kustomization.yaml

@@ -11,4 +11,4 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: validating-webhook-configuration
   annotations:
-    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert
+    cert-manager.io/inject-ca-from: capi-webhook-system/capc-serving-cert