From 41ae00665fc00e6a1468879e33a49f158c04df21 Mon Sep 17 00:00:00 2001
From: Dennis Schmalacker <schmalacker@mecodia.de>
Date: Mon, 11 Jan 2021 15:53:18 +0100
Subject: [PATCH] Try to fix some bugs in the helm chart

---
 .../templates/apiservice.yaml                            | 2 +-
 .../templates/deployment.yaml                            | 9 +++++----
 deploy/cert-manager-webhook-hetzner/templates/rbac.yaml  | 1 +
 .../cert-manager-webhook-hetzner/templates/service.yaml  | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/deploy/cert-manager-webhook-hetzner/templates/apiservice.yaml b/deploy/cert-manager-webhook-hetzner/templates/apiservice.yaml
index ea87db1..6c6a657 100644
--- a/deploy/cert-manager-webhook-hetzner/templates/apiservice.yaml
+++ b/deploy/cert-manager-webhook-hetzner/templates/apiservice.yaml
@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
-    certmanager.k8s.io/inject-ca-from: "{{ .Release.Namespace }}/{{ include "cert-manager-webhook-hetzner.servingCertificate" . }}"
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/{{ include "cert-manager-webhook-hetzner.servingCertificate" . }}"
 spec:
   group: {{ .Values.groupName }}
   groupPriorityMinimum: 1000
diff --git a/deploy/cert-manager-webhook-hetzner/templates/deployment.yaml b/deploy/cert-manager-webhook-hetzner/templates/deployment.yaml
index fa7058c..808428d 100644
--- a/deploy/cert-manager-webhook-hetzner/templates/deployment.yaml
+++ b/deploy/cert-manager-webhook-hetzner/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "cert-manager-webhook-hetzner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-webhook-hetzner.name" . }}
     chart: {{ include "cert-manager-webhook-hetzner.chart" . }}
@@ -37,14 +38,14 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              scheme: 8443
+              scheme: HTTPS
               path: /healthz
-              port: https
+              port: 8443
           readinessProbe:
             httpGet:
-              scheme: 8443
+              scheme: HTTPS
               path: /healthz
-              port: https
+              port: 8443
           volumeMounts:
             - name: certs
               mountPath: /tls
diff --git a/deploy/cert-manager-webhook-hetzner/templates/rbac.yaml b/deploy/cert-manager-webhook-hetzner/templates/rbac.yaml
index 0caffbf..dc23b47 100644
--- a/deploy/cert-manager-webhook-hetzner/templates/rbac.yaml
+++ b/deploy/cert-manager-webhook-hetzner/templates/rbac.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "cert-manager-webhook-hetzner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-webhook-hetzner.name" . }}
     chart: {{ include "cert-manager-webhook-hetzner.chart" . }}
diff --git a/deploy/cert-manager-webhook-hetzner/templates/service.yaml b/deploy/cert-manager-webhook-hetzner/templates/service.yaml
index d6c563b..f6604e0 100644
--- a/deploy/cert-manager-webhook-hetzner/templates/service.yaml
+++ b/deploy/cert-manager-webhook-hetzner/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "cert-manager-webhook-hetzner.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "cert-manager-webhook-hetzner.name" . }}
     chart: {{ include "cert-manager-webhook-hetzner.chart" . }}