From a598b0e12668be45d7346f761b0b00432e40fa11 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Mon, 29 Apr 2019 18:47:23 +0100
Subject: [PATCH] Add Makefile and make options configurable

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 Makefile                                   | 20 ++++++++++++++++++++
 deploy/example-webhook/templates/NOTES.txt | 19 -------------------
 deploy/example-webhook/values.yaml         | 15 +--------------
 main.go                                    |  7 ++++++-
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index e69de29..bddb85d 100644
--- a/Makefile
+++ b/Makefile
@@ -0,0 +1,20 @@
+IMAGE_NAME := "webhook"
+IMAGE_TAG := "latest"
+
+OUT := $(shell pwd)/_out
+
+$(shell mkdir -p "$(OUT)")
+
+verify:
+	go test -v .
+
+build:
+	docker build -t "$(IMAGE_NAME):$(IMAGE_TAG)" .
+
+.PHONY: rendered-manifest.yaml
+rendered-manifest.yaml:
+	helm template \
+	    --name example-webhook \
+        --set image.repository=$(IMAGE_NAME) \
+        --set image.tag=$(IMAGE_TAG) \
+        deploy/example-webhook > "$(OUT)/rendered-manifest.yaml"
diff --git a/deploy/example-webhook/templates/NOTES.txt b/deploy/example-webhook/templates/NOTES.txt
index 197e374..e69de29 100644
--- a/deploy/example-webhook/templates/NOTES.txt
+++ b/deploy/example-webhook/templates/NOTES.txt
@@ -1,19 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "example-webhook.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "example-webhook.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "example-webhook.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "example-webhook.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/deploy/example-webhook/values.yaml b/deploy/example-webhook/values.yaml
index da3f9eb..31eb151 100644
--- a/deploy/example-webhook/values.yaml
+++ b/deploy/example-webhook/values.yaml
@@ -14,7 +14,7 @@ certManager:
 
 image:
   repository: mycompany/webhook-image
-  tag: stable
+  tag: latest
   pullPolicy: IfNotPresent
 
 nameOverride: ""
@@ -24,19 +24,6 @@ service:
   type: ClusterIP
   port: 443
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/main.go b/main.go
index 8a4c78b..85aeac9 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 
 	extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	//"k8s.io/client-go/kubernetes"
@@ -12,9 +13,13 @@ import (
 	"github.com/jetstack/cert-manager/pkg/acme/webhook/cmd"
 )
 
-const GroupName = "acme.mycompany.com"
+var GroupName = os.Getenv("GROUP_NAME")
 
 func main() {
+	if GroupName == "" {
+		panic("GROUP_NAME must be specified")
+	}
+
 	// This will register our custom DNS provider with the webhook serving
 	// library, making it available as an API under the provided GroupName.
 	// You can register multiple DNS provider implementations with a single