finalize helm template

Author: eksrha

helm/templates/configmap.yaml

@@ -17,11 +17,11 @@ data:
   {{- if .Values.envValues.dns_forwarder }}
   DNS_FORWARDER: {{ .Values.envValues.dns_forwarder | quote }}
   {{- end }}
-  TTL_TIME: {{ int .Values.envValues.ttl_time }}
-  REFRESH_TIME: {{ int .Values.envValues.refresh_time }}
-  RETRY_TIME: {{ int .Values.envValues.retry_time }}
-  EXPIRY_TIME: {{ int .Values.envValues.expiry_time }}
-  MAX_CACHE_TIME: {{ int .Values.envValues.max_cache_time }}
+  TTL_TIME: {{ .Values.envValues.ttl_time | quote }}
+  REFRESH_TIME: {{ .Values.envValues.refresh_time | quote }}
+  RETRY_TIME: {{ .Values.envValues.retry_time | quote }}
+  EXPIRY_TIME: {{ .Values.envValues.expiry_time | quote }}
+  MAX_CACHE_TIME: {{ .Values.envValues.max_cache_time | quote }}
   {{- if .Values.envValues.allow_query }}
   ALLOW_QUERY: {{ .Values.envValues.allow_query | quote }}
   {{- end }}

helm/templates/service.yaml

@@ -1,21 +1,32 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "dns-bind.fullname" . }}
+  name: {{ include "dns-bind.fullname" . }}-dns
   labels:
     {{- include "dns-bind.labels" . | nindent 4 }}
+  annotations:
+  {{- with .Values.serviceDns.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
-  type: {{ .Values.serviceDns.type }}
-  {{- if .Values.serviceDns.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.serviceDns.loadBalancerIP }}
+  type: {{ default "ClusterIP" .Values.serviceDns.type }}
+  {{- if .Values.serviceDns.clusterIP }}
+  clusterIP: {{ .Values.serviceDns.clusterIP }}
+  {{- end }}
+  {{- if .Values.serviceDns.externalIPs }}
+  externalIPs:
+  {{ toYaml .Values.serviceDns.externalIPs | indent 4 }}
   {{- end }}
   {{- if or (eq .Values.serviceDns.type "NodePort") (eq .Values.serviceDns.type "LoadBalancer") }}
   externalTrafficPolicy: {{ .Values.serviceDns.externalTrafficPolicy }}
   {{- end }}
+  {{- if .Values.serviceDns.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.serviceDns.loadBalancerIP }}
+  {{- end }}
   ports:
     - port: 53
       targetPort: dns
-      {{- if .Values.serviceDns.nodePort }}
+      {{- if and (.Values.serviceDns.nodePort) (eq .Values.serviceDns.type "NodePort") }}
       nodePort: {{ .Values.serviceDns.nodePort }}
       {{- end }}
       protocol: TCP

helm/values.yaml

@@ -11,30 +11,31 @@ image:
   tag: ""
 
 envValues:
-  debug_entrypoint: 0
-  docker_logs: 0
+  debug_entrypoint: "0"
+  docker_logs: "0"
   wildcard_dns: "corp.tld=10.1.5.90"
-  extra_hosts: ""
+  extra_hosts:
   dnssec_validate: "no"
-  dns_forwarder: ""
+  dns_forwarder:
   ttl_time: 3600
   refresh_time: 1200
   retry_time: 180
   expiry_time: 1209600
   max_cache_time: 10800
-  allow_query: ""
-  allow_recursion: ""
+  allow_query: 
+  allow_recursion:
 
 serviceDns:
-  mixedService: true
   type: LoadBalancer
-  nodePort: ""
+  nodePort:
+  clusterIP:
+  externalIPs: {}
   externalTrafficPolicy: Local
-  loadBalancerIP: "10.1.5.99"
-  loadBalancerIPv6: ""
+  loadBalancerIP: 10.1.5.99
+  loadBalancerIPv6:
   annotations:
-    # metallb.universe.tf/address-pool: network-services
-    # metallb.universe.tf/allow-shared-ip: bind-svc
+    metallb.universe.tf/address-pool: network-services
+    metallb.universe.tf/allow-shared-ip: "true"
 
 
 imagePullSecrets: []