From 9ab45d62332793b0a6a14e3283603a25708bd5c8 Mon Sep 17 00:00:00 2001
From: Alejandro Escanero Blanco <aescanero@gmail.com>
Date: Sat, 19 Sep 2020 00:55:15 +0200
Subject: [PATCH] Issue 14: Update to 0.1.9

---
 charts/powerdns/Chart.yaml          |  4 ++--
 charts/powerdns/templates/NOTES.txt |  8 +++----
 charts/powerdns/values.yaml         | 35 ++---------------------------
 3 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/charts/powerdns/Chart.yaml b/charts/powerdns/Chart.yaml
index 9720be0..ded9ba8 100644
--- a/charts/powerdns/Chart.yaml
+++ b/charts/powerdns/Chart.yaml
@@ -14,9 +14,9 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.8
+version: 0.1.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0
+appVersion: 4.3.4
diff --git a/charts/powerdns/templates/NOTES.txt b/charts/powerdns/templates/NOTES.txt
index 25385f5..3b9d1b4 100644
--- a/charts/powerdns/templates/NOTES.txt
+++ b/charts/powerdns/templates/NOTES.txt
@@ -2,7 +2,7 @@ Access to the DNS Server and Dashboard by running these commands:
 {{- if .Values.admin.ingress.enabled }}
   http://{{ .Values.admin.ingress.hostname }}.{{ .Values.powerdns.domain }}{{ .Values.admin.ingress.path }}
 {{- end }}
-{{- if eq .Values.powerdns.service.dns.tcp.type "NodePort" }}
+{{- if eq .Values.service.dns.tcp.type "NodePort" }}
   export NODE_PORT=$(kubectl {{- if .Release.Namespace }} -n {{.Release.Namespace}} {{ end -}} get -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "powerdns.fullname" . }})-service-dns-tcp
   export NODE_IP=$(kubectl {{- if .Release.Namespace }} -n {{.Release.Namespace}} {{ end -}} get nodes -o jsonpath="{.items[0].status.addresses[0].address}")
   echo Point your DNS client to $NODE_IP:$NODE_PORT
@@ -14,16 +14,16 @@ Access to the DNS Server and Dashboard by running these commands:
   echo Dashboard access at http://$SERVICE_IP2:{{ .Values.admin.service.port }}
 {{- end }}
 
-{{- if eq .Values.powerdns.service.dns.tcp.type "LoadBalancer" }}
+{{- if eq .Values.service.dns.tcp.type "LoadBalancer" }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
            You can watch the status of by running 'kubectl {{ if .Release.Namespace }} -n {{.Release.Namespace}} {{ end }} get svc -w {{ template "powerdns.fullname" . }}'
   export SERVICE_IP1=$(kubectl {{ if .Release.Namespace }} -n {{.Release.Namespace}} {{ end }} get svc {{ template "powerdns.fullname" . }}-service-dns-tcp -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   export SERVICE_IP2=$(kubectl {{ if .Release.Namespace }} -n {{.Release.Namespace}} {{ end }} get svc {{ template "powerdns.fullname" . }}-service-admin -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo Point your DNS client to $SERVICE_IP1:{{ .Values.powerdns.service.dns.tcp.port }}
+  echo Point your DNS client to $SERVICE_IP1:{{ .Values.service.dns.tcp.port }}
   echo Dashboard access at http://$SERVICE_IP2:{{ .Values.admin.service.port }}
 {{- end }}
 
-{{- if contains "ClusterIP" .Values.powerdns.service.dns.tcp.type }}
+{{- if contains "ClusterIP" .Values.service.dns.tcp.type }}
   export POD_NAME=$(kubectl {{- if .Release.Namespace }} -n {{.Release.Namespace}} {{ end -}} get pods -l "app={{ template "powerdns.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Point your DNS client to 127.0.0.1:53"
   kubectl port-forward $POD_NAME 53:53
diff --git a/charts/powerdns/values.yaml b/charts/powerdns/values.yaml
index dfbefb1..e46cfc6 100644
--- a/charts/powerdns/values.yaml
+++ b/charts/powerdns/values.yaml
@@ -1,6 +1,6 @@
 #Author: aescanero@disasterproject.com
 #Website: www.disasterproject.com
-#Version: 0.1
+#Version: 0.3
 
 enabled: true
 service:
@@ -25,23 +25,10 @@ image:
 domain: external.local
 master: "yes"
 api: "yes"
-webserver: "yes"
-webserver_address: "0.0.0.0"
-webserver_allow_from: "0.0.0.0/0"
 version_string: "anonymous"
 default_ttl: "1500"
 soa_minimum_ttl: "1200"
 default_soa_name: "ns1.external.local"
-mysql_host: "127.0.0.1"
-mysql_database: "powerdns"
-mysql_user: "powerdns"
-requests:
-  memory: "512Mi"
-  cpu: "300m"
-limits:
-  memory: "512Mi"
-  cpu: "300m"
-
 apikey: foobarbaz
 
 metallb:
@@ -49,21 +36,6 @@ metallb:
 
 powerdns:
   enabled: true
-  service:
-    dns:
-      tcp:
-        enabled: false
-        type: LoadBalancer
-        port: 53
-        annotations:
-      udp:
-        enabled: true
-        type: LoadBalancer
-        port: 53
-        annotations:
-    api:
-      type: ClusterIP
-      port: 8081
   image:
     repository: pschiffe/pdns-mysql
     tag: alpine
@@ -78,7 +50,7 @@ powerdns:
   default_ttl: "1500"
   soa_minimum_ttl: "1200"
   default_soa_name: "ns1.external.local"
-  # mysql_host: "127.0.0.1"
+  mysql_host: "127.0.0.1"
   mysql_database: "powerdns"
   mysql_user: "powerdns"
   requests:
@@ -88,9 +60,6 @@ powerdns:
     memory: "512Mi"
     cpu: "300m"
 
-
-
-
 mariadb:
   enabled: true
   image: