Prepare crds folder with kustomize

Author: SzymonSAP

.github/workflows/publish-chart.yml

@@ -41,8 +41,16 @@ jobs:
           fi
           echo "version=$CHART_VERSION" >> $GITHUB_OUTPUT
 
-      - name: Move crds folder out of templates
-        run: mv dist/chart/templates/crd dist/chart/crds
+      - name: Install Kustomize
+        run: |
+          curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+          mv kustomize /usr/local/bin
+
+      - name: Prepare CRDs folder
+        run: |
+          mkdir -p dist/chart/crds
+          kustomize build config/crd > dist/chart/crds/crds.yaml
+          rm -rf dist/chart/templates/crd
 
       - name: Package Helm chart
         run: |

config/crd/kustomization.yaml

@@ -33,6 +33,8 @@ patches:
 #- path: patches/cainjection_in_serverclaims.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
+commonAnnotations:
+  cert-manager.io/inject-ca-from: metal-operator-system/metal-operator-serving-cert
 # [WEBHOOK] To enable webhook, uncomment the following section
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 

config/crd/patches/cainjection_in_bmcs.yaml

@@ -9,8 +9,8 @@ spec:
     webhook:
       clientConfig:
         service:
-          namespace: system
-          name: webhook-service
+          namespace: metal-operator-system
+          name: metal-operator-webhook-service
           path: /convert
       conversionReviewVersions:
       - v1

config/crd/patches/cainjection_in_serverclaims.yaml

@@ -9,8 +9,8 @@ spec:
     webhook:
       clientConfig:
         service:
-          namespace: system
-          name: webhook-service
+          namespace: metal-operator-system
+          name: metal-operator-webhook-service
           path: /convert
       conversionReviewVersions:
       - v1

config/crd/patches/webhook_in_bmcs.yaml

@@ -121,7 +121,7 @@ replacements:
   - source: # Add cert-manager annotation to the webhook Service
       kind: Service
       version: v1
-      name: webhook-service
+      name: metal-operator-webhook-service
       fieldPath: .metadata.name # namespace of the service
     targets:
       - select:
@@ -138,7 +138,7 @@ replacements:
   - source:
       kind: Service
       version: v1
-      name: webhook-service
+      name: metal-operator-webhook-service
       fieldPath: .metadata.namespace # namespace of the service
     targets:
       - select:

config/crd/patches/webhook_in_serverclaims.yaml

@@ -4,8 +4,8 @@ metadata:
   labels:
     app.kubernetes.io/name: metal-operator
     app.kubernetes.io/managed-by: kustomize
-  name: webhook-service
-  namespace: system
+  name: metal-operator-webhook-service
+  namespace: metal-operator-system
 spec:
   ports:
     - port: 443

config/default/kustomization.yaml

@@ -21,8 +21,8 @@ spec:
     webhook:
       clientConfig:
         service:
-          namespace: {{ .Release.Namespace }}
-          name: webhook-service
+          namespace: metal-operator-system
+          name: metal-operator-webhook-service
           path: /convert
       conversionReviewVersions:
       - v1

config/webhook/service.yaml

@@ -21,8 +21,8 @@ spec:
     webhook:
       clientConfig:
         service:
-          namespace: {{ .Release.Namespace }}
-          name: webhook-service
+          namespace: metal-operator-system
+          name: metal-operator-webhook-service
           path: /convert
       conversionReviewVersions:
       - v1