From 800668d59beced6105dd84663e1e7dc18013305d Mon Sep 17 00:00:00 2001
From: Tim Dawson <tidawson@redhat.com>
Date: Thu, 15 Jul 2021 10:10:38 +1200
Subject: [PATCH] Changed deploy name, and made pod listen on non privilaged
 port

---
 Makefile                                         | 6 +++---
 deploy/example-webhook/Chart.yaml                | 2 +-
 deploy/example-webhook/templates/deployment.yaml | 7 ++++---
 deploy/example-webhook/templates/service.yaml    | 2 +-
 deploy/example-webhook/values.yaml               | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 5369d0d..07149fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 OS ?= $(shell go env GOOS)
 ARCH ?= $(shell go env GOARCH)
 
-IMAGE_NAME := "webhook"
+IMAGE_NAME := "quay.io/tidawson/pdns-webhook"
 IMAGE_TAG := "latest"
 
 OUT := $(shell pwd)/_out
@@ -31,8 +31,8 @@ build:
 
 .PHONY: rendered-manifest.yaml
 rendered-manifest.yaml:
-	helm template \
-	    --name example-webhook \
+	helm3.6 template \
+	pdns-webhook \
         --set image.repository=$(IMAGE_NAME) \
         --set image.tag=$(IMAGE_TAG) \
         deploy/example-webhook > "$(OUT)/rendered-manifest.yaml"
diff --git a/deploy/example-webhook/Chart.yaml b/deploy/example-webhook/Chart.yaml
index 77c6ead..abe606e 100644
--- a/deploy/example-webhook/Chart.yaml
+++ b/deploy/example-webhook/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: example-webhook
+name: pdns-webhook
 version: 0.1.0
diff --git a/deploy/example-webhook/templates/deployment.yaml b/deploy/example-webhook/templates/deployment.yaml
index ed49463..613cdca 100644
--- a/deploy/example-webhook/templates/deployment.yaml
+++ b/deploy/example-webhook/templates/deployment.yaml
@@ -27,23 +27,24 @@ spec:
           args:
             - --tls-cert-file=/tls/tls.crt
             - --tls-private-key-file=/tls/tls.key
+            - --secure-port=8043
           env:
             - name: GROUP_NAME
               value: {{ .Values.groupName | quote }}
           ports:
             - name: https
-              containerPort: 443
+              containerPort: 8043
               protocol: TCP
           livenessProbe:
             httpGet:
               scheme: HTTPS
               path: /healthz
-              port: https
+              port: 8043
           readinessProbe:
             httpGet:
               scheme: HTTPS
               path: /healthz
-              port: https
+              port: 8043
           volumeMounts:
             - name: certs
               mountPath: /tls
diff --git a/deploy/example-webhook/templates/service.yaml b/deploy/example-webhook/templates/service.yaml
index 572089e..364b691 100644
--- a/deploy/example-webhook/templates/service.yaml
+++ b/deploy/example-webhook/templates/service.yaml
@@ -11,7 +11,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: https
+      targetPort: 8043
       protocol: TCP
       name: https
   selector:
diff --git a/deploy/example-webhook/values.yaml b/deploy/example-webhook/values.yaml
index 31eb151..aa57f52 100644
--- a/deploy/example-webhook/values.yaml
+++ b/deploy/example-webhook/values.yaml
@@ -13,7 +13,7 @@ certManager:
   serviceAccountName: cert-manager
 
 image:
-  repository: mycompany/webhook-image
+  repository: quay.io/tidawson/pdns-webhook
   tag: latest
   pullPolicy: IfNotPresent