From 931ef39800a329b9f834024af680eadc62e55e60 Mon Sep 17 00:00:00 2001
From: Arik Hadas <ahadas@redhat.com>
Date: Sun, 11 Feb 2024 09:48:08 +0200
Subject: [PATCH] Drop unused webhook-server-secret

Signed-off-by: Arik Hadas <ahadas@redhat.com>
---
 operator/roles/forkliftcontroller/tasks/main.yml  |  5 -----
 .../controller/deployment-controller.yml.j2       | 15 ---------------
 .../templates/secret-webhook-server-secret.yml.j2 |  6 ------
 3 files changed, 26 deletions(-)
 delete mode 100644 operator/roles/forkliftcontroller/templates/secret-webhook-server-secret.yml.j2

diff --git a/operator/roles/forkliftcontroller/tasks/main.yml b/operator/roles/forkliftcontroller/tasks/main.yml
index d823f6485..51546703e 100644
--- a/operator/roles/forkliftcontroller/tasks/main.yml
+++ b/operator/roles/forkliftcontroller/tasks/main.yml
@@ -52,11 +52,6 @@
           state: present
           definition: "{{ lookup('template', 'configmap-trusted-ca.yml.j2') }}"
 
-  - name: "Setup the webhook secret"
-    k8s:
-      state: present
-      definition: "{{ lookup('template', 'secret-webhook-server-secret.yml.j2') }}"
-
   - name: "Setup controller config map"
     k8s:
       state : present
diff --git a/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2 b/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2
index f34e969b3..c6bde2206 100644
--- a/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2
+++ b/operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2
@@ -50,8 +50,6 @@ spec:
         - name: API_TLS_CA
           value: /var/run/secrets/{{ inventory_tls_secret_name }}/ca.crt
 {% endif %}
-        - name: SECRET_NAME
-          value: webhook-server-secret
 {% if controller_log_level is defined and controller_log_level is number %}
         - name: LOG_LEVEL
           value: "{{ controller_log_level }}"
@@ -107,10 +105,6 @@ spec:
             name: {{ controller_configmap_name }}
         image: {{ controller_image_fqin }}
         imagePullPolicy: {{ image_pull_policy }}
-        ports:
-        - containerPort: 9876
-          name: webhook-server
-          protocol: TCP
         resources:
           limits:
             cpu: {{ controller_container_limits_cpu }}
@@ -119,9 +113,6 @@ spec:
             cpu: {{ controller_container_requests_cpu }}
             memory: {{ controller_container_requests_memory }}
         volumeMounts:
-        - mountPath: /tmp/cert
-          name: cert
-          readOnly: true
         - mountPath: {{ profiler_volume_path }}
           name: profiler
 {% if k8s_cluster|bool %}
@@ -150,8 +141,6 @@ spec:
           value: /var/run/secrets/{{ inventory_tls_secret_name }}/tls.key
         - name: METRICS_PORT
           value: '8082'
-        - name: SECRET_NAME
-          value: webhook-server-secret
         - name: OVA_PROVIDER_SERVER_IMAGE
           value: {{ ova_provider_server_fqin }}
 {% if feature_validation|bool %}
@@ -208,10 +197,6 @@ spec:
 {% endif %}
       terminationGracePeriodSeconds: 10
       volumes:
-      - name: cert
-        secret:
-          defaultMode: 420
-          secretName: webhook-server-secret
       - name: {{ inventory_tls_secret_name }}
         secret:
           defaultMode: 420
diff --git a/operator/roles/forkliftcontroller/templates/secret-webhook-server-secret.yml.j2 b/operator/roles/forkliftcontroller/templates/secret-webhook-server-secret.yml.j2
deleted file mode 100644
index 3c63d1784..000000000
--- a/operator/roles/forkliftcontroller/templates/secret-webhook-server-secret.yml.j2
+++ /dev/null
@@ -1,6 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: webhook-server-secret
-  namespace: {{ app_namespace }}