From cdac210e24386ddddb0f72c9eb1ab63d1386af7e Mon Sep 17 00:00:00 2001
From: Fabrizio Sestito <fabrizio.sestito@suse.com>
Date: Wed, 24 Jul 2024 12:34:52 +0200
Subject: [PATCH] refactor!: remove cert-manager references from readme and
 values

Signed-off-by: Fabrizio Sestito <fabrizio.sestito@suse.com>
---
 charts/kubewarden-controller/README.md        |  6 +-----
 charts/kubewarden-controller/questions.yaml   | 20 -------------------
 .../templates/deployment.yaml                 |  2 +-
 .../kubewarden-controller/templates/rbac.yaml |  1 +
 charts/kubewarden-controller/values.yaml      | 11 ----------
 5 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/charts/kubewarden-controller/README.md b/charts/kubewarden-controller/README.md
index e6a84820..be9f04a3 100644
--- a/charts/kubewarden-controller/README.md
+++ b/charts/kubewarden-controller/README.md
@@ -11,21 +11,17 @@ The kubewarden-controller can be deployed using a helm chart.
 
 ## Installing the charts
 
-Make sure you have [`cert-manager` installed](https://cert-manager.io/docs/installation/)
-and then install the kubewarden-controller chart.
-
 If you want to enable telemetry, you also need to install [OpenTelemetry Operator](https://github.com/open-telemetry/opentelemetry-operator).
 
 For example:
 ```console
-$ kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.5.3/cert-manager.yaml
 $ helm repo add kubewarden https://charts.kubewarden.io
 $ helm install --create-namespace -n kubewarden kubewarden-crds kubewarden/kubewarden-crds
 $ helm install --wait -n kubewarden kubewarden-controller kubewarden/kubewarden-controller
 $ helm install --wait -n kubewarden kubewarden-defaults kubewarden/kubewarden-defaults
 ```
 
-This will install cert-manager, kubewarden-crds, kubewarden-controller, and a
+This will install kubewarden-crds, kubewarden-controller, and a
 default PolicyServer on the Kubernetes cluster in the default configuration
 (which includes self-signed TLS certs).
 
diff --git a/charts/kubewarden-controller/questions.yaml b/charts/kubewarden-controller/questions.yaml
index 1060d624..3a5e74e3 100644
--- a/charts/kubewarden-controller/questions.yaml
+++ b/charts/kubewarden-controller/questions.yaml
@@ -114,26 +114,6 @@ questions:
     description: |
       Number of replicas of the Controller Deployment
     group: "Controller HA"
-  # Certificates:
-  - variable: tls.source
-    default: "cert-manager-self-signed"
-    description: "Source for TLS certificates"
-    label: TLS certificates source
-    type: enum
-    options:
-      - "cert-manager-self-signed"
-      - "cert-manager"
-    show_subquestion_if: "cert-manager"
-    group: "Certificates"
-    subquestions:
-      - variable: "tls.certManagerIssuerName"
-        type: string
-        default: ""
-        label: cert-manager Issuer name
-        description: |
-          Name of cert-manager Issuer
-        group: "Certificates"
-        show_if: "tls.source=cert-manager"
   # Telemetry:
   - variable: "telemetry.metrics.enabled"
     type: boolean
diff --git a/charts/kubewarden-controller/templates/deployment.yaml b/charts/kubewarden-controller/templates/deployment.yaml
index 68067b6d..c5d53203 100644
--- a/charts/kubewarden-controller/templates/deployment.yaml
+++ b/charts/kubewarden-controller/templates/deployment.yaml
@@ -87,7 +87,7 @@ spec:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: webhook-server-cert
+          secretName: kubewarden-webhook-server-cert
       {{- if .Values.podSecurityContext }}
       securityContext:
 {{ toYaml .Values.podSecurityContext | indent 8 }}
diff --git a/charts/kubewarden-controller/templates/rbac.yaml b/charts/kubewarden-controller/templates/rbac.yaml
index 521c77f9..0920b800 100644
--- a/charts/kubewarden-controller/templates/rbac.yaml
+++ b/charts/kubewarden-controller/templates/rbac.yaml
@@ -122,6 +122,7 @@ rules:
   - create
   - delete
   - list
+  - get
   - patch
   - watch
 - apiGroups:
diff --git a/charts/kubewarden-controller/values.yaml b/charts/kubewarden-controller/values.yaml
index d95d616e..966204a0 100644
--- a/charts/kubewarden-controller/values.yaml
+++ b/charts/kubewarden-controller/values.yaml
@@ -113,17 +113,6 @@ podAnnotations: {}
 nodeSelector: {}
 tolerations: []
 affinity: {}
-tls:
-  # source options:
-  # - "cert-manager-self-signed": Scaffold cert-manager integration, and create
-  #   a self-signed certificate with a cert-manager self-signed Issuer. Depends
-  #   on cert-manager. (default)
-  # - "cert-manager": Scafffold cert-manager integration. User configures their
-  #   own Issuer. Depends on cert-manager. Set tls.certManagerIssuerName to the
-  #   desired Issuer.
-  source: cert-manager-self-signed
-  # "cert-manager"-only options:
-  certManagerIssuerName: ""
 # Resource limits & requests
 # Ref: https://kubernetes.io/docs/user-guide/compute-resources/
 resources: