[blocky] - fix minor issues (#159)

* remove extraneous service from values

* fix prom service type and port mapping

* allow annotations

* bump chart version

* fix notes file

charts/blocky/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.5"
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 1.0.1
+version: 1.1.0
 keywords:
   - blocky
   - dbs

charts/blocky/templates/NOTES.txt

@@ -1,14 +1,14 @@
 1. Get the application URL by running these commands:
-{{- if contains "NodePort" .Values.service.type }}
+{{- if contains "NodePort" .Values.serviceUDP.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "blocky.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 }}
+{{- else if contains "LoadBalancer" .Values.serviceUDP.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 "blocky.fullname" . }}'
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "blocky.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
+  echo http://$SERVICE_IP:{{ .Values.serviceUDP.port }}
+{{- else if contains "ClusterIP" .Values.serviceUDP.type }}
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "blocky.name" . }},app.kubernetes.io/instance={{ .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

charts/blocky/templates/service-prometheus.yaml

@@ -9,9 +9,9 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .Values.servicePrometheus.type }}
   ports:
-    - port: {{ .Values.service.port }}
+    - port: {{ .Values.servicePrometheus.port }}
       targetPort: http
       protocol: TCP
       name: prometheus

charts/blocky/templates/service-tcp.yaml

@@ -8,6 +8,10 @@ metadata:
     helm.sh/chart: {{ include "blocky.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.serviceTCP.annotations }}
+  annotations:
+{{ toYaml .Values.serviceTCP.annotations | indent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.serviceTCP.type }}
   {{- if .Values.serviceTCP.loadBalancerIP }}

charts/blocky/templates/service-udp.yaml

@@ -8,6 +8,10 @@ metadata:
     helm.sh/chart: {{ include "blocky.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.serviceUDP.annotations }}
+  annotations:
+{{ toYaml .Values.serviceUDP.annotations | indent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.serviceUDP.type }}
   {{- if .Values.serviceUDP.loadBalancerIP }}

charts/blocky/values.yaml

@@ -132,10 +132,6 @@ probes:
     failureThreshold: 30
     periodSeconds: 10
 
-service:
-  type: ClusterIP
-  port: 53
-
 serviceTCP:
   enabled: false
   type: NodePort