From 2115daa3177b1e877e08ecedecbdc7a73f110bb1 Mon Sep 17 00:00:00 2001
From: subhamkrai <srai@redhat.com>
Date: Wed, 9 Mar 2022 09:14:41 +0530
Subject: [PATCH] core: refactor webhook config and related script

This commit refactor webhook config by adding/removing
spaces. Also, moved the Issue and Certificate creation
from bash script to webhook config yaml.

Signed-off-by: subhamkrai <srai@redhat.com>
---
 tests/scripts/deploy_admission_controller.sh | 38 +++-------------
 tests/scripts/webhook-config.yaml            | 47 +++++++++++++++-----
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/tests/scripts/deploy_admission_controller.sh b/tests/scripts/deploy_admission_controller.sh
index 066627436..97ea91aab 100755
--- a/tests/scripts/deploy_admission_controller.sh
+++ b/tests/scripts/deploy_admission_controller.sh
@@ -81,38 +81,10 @@ EOF
 
 echo "Successfully deployed cert-manager"
 
-echo "Creating Issuer and Certificate"
-cat <<EOF | kubectl create -f -
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: selfsigned-issuer
-  namespace: ${NAMESPACE}
-spec:
-  selfSigned: {}
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: rook-admission-controller-cert
-  namespace: ${NAMESPACE}
-spec:
-  dnsNames:
-  - ${SERVICE_NAME}
-  - ${SERVICE_NAME}.${NAMESPACE}.svc
-  - ${SERVICE_NAME}.${NAMESPACE}.svc.cluster.local
-  issuerRef:
-    kind: Issuer
-    name: selfsigned-issuer
-  secretName: rook-ceph-admission-controller
-EOF
-
-echo "Successfully created Issuer and Certificate"
-
+echo "Creating Issuer, Certificate and Deploying webhook config"
 echo "Deploying webhook config"
-< "${BASE_DIR}"/webhook-config.yaml \
-        sed -e "s|\${NAMESPACE}|${NAMESPACE}|g" | \
-        sed -e "s|\${WEBHOOK_CONFIG_NAME}|${WEBHOOK_CONFIG_NAME}|g" | \
-        sed -e "s|\${SERVICE_NAME}|${SERVICE_NAME}|g" | \
-        kubectl create -f -
+
+envsubst < "${BASE_DIR}"/webhook-config.yaml |
+kubectl create -f -
+
 echo "Webhook deployed! Please start the rook operator to create the service and admission controller pods"
diff --git a/tests/scripts/webhook-config.yaml b/tests/scripts/webhook-config.yaml
index 121f8c850..295e8a2e5 100644
--- a/tests/scripts/webhook-config.yaml
+++ b/tests/scripts/webhook-config.yaml
@@ -1,3 +1,26 @@
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: selfsigned-issuer
+  namespace: ${NAMESPACE}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: rook-admission-controller-cert
+  namespace: ${NAMESPACE}
+spec:
+  dnsNames:
+    - ${SERVICE_NAME}
+    - ${SERVICE_NAME}.${NAMESPACE}.svc
+    - ${SERVICE_NAME}.${NAMESPACE}.svc.cluster.local
+  issuerRef:
+    kind: Issuer
+    name: selfsigned-issuer
+  secretName: rook-ceph-admission-controller
+---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
@@ -7,43 +30,43 @@ metadata:
 webhooks:
   - name: cephcluster-wh-${SERVICE_NAME}-${NAMESPACE}.rook.io
     rules:
-      - apiGroups:   ["ceph.rook.io"]
+      - apiGroups: ["ceph.rook.io"]
         apiVersions: ["v1"]
-        operations:  ["CREATE","UPDATE","DELETE"]
-        resources:   ["cephclusters"]
+        operations: ["CREATE", "UPDATE", "DELETE"]
+        resources: ["cephclusters"]
     clientConfig:
       service:
         name: ${SERVICE_NAME}
         namespace: ${NAMESPACE}
         path: /validate-ceph-rook-io-v1-cephcluster
-    admissionReviewVersions: ["v1", "v1beta1"]  # API server will try to use first version in the list which it supports.
+    admissionReviewVersions: ["v1", "v1beta1"] # API server will try to use first version in the list which it supports.
     sideEffects: None
     timeoutSeconds: 5
   - name: cephblockpool-wh-${SERVICE_NAME}-${NAMESPACE}.rook.io
     rules:
-      - apiGroups:   ["ceph.rook.io"]
+      - apiGroups: ["ceph.rook.io"]
         apiVersions: ["v1"]
-        operations:  ["CREATE","UPDATE","DELETE"]
-        resources:   ["cephblockpools"]
+        operations: ["CREATE", "UPDATE", "DELETE"]
+        resources: ["cephblockpools"]
     clientConfig:
       service:
         name: ${SERVICE_NAME}
         namespace: ${NAMESPACE}
         path: /validate-ceph-rook-io-v1-cephblockpool
-    admissionReviewVersions: ["v1", "v1beta1"]  # API server will try to use first version in the list which it supports.
+    admissionReviewVersions: ["v1", "v1beta1"] # API server will try to use first version in the list which it supports.
     sideEffects: None
     timeoutSeconds: 5
   - name: cephobjectstore-wh-${SERVICE_NAME}-${NAMESPACE}.rook.io
     rules:
-      - apiGroups:   ["ceph.rook.io"]
+      - apiGroups: ["ceph.rook.io"]
         apiVersions: ["v1"]
-        operations:  ["CREATE","UPDATE","DELETE"]
-        resources:   ["cephobjectstores"]
+        operations: ["CREATE", "UPDATE", "DELETE"]
+        resources: ["cephobjectstores"]
     clientConfig:
       service:
         name: ${SERVICE_NAME}
         namespace: ${NAMESPACE}
         path: /validate-ceph-rook-io-v1-cephobjectstore
-    admissionReviewVersions: ["v1", "v1beta1"]  # API server will try to use first version in the list which it supports.
+    admissionReviewVersions: ["v1", "v1beta1"] # API server will try to use first version in the list which it supports.
     sideEffects: None
     timeoutSeconds: 5