From 6dd129e4a91ff9d242d72ccda5ad759f359d2166 Mon Sep 17 00:00:00 2001
From: Jeff Billimek <jeff@billimek.com>
Date: Tue, 14 Apr 2020 09:31:23 -0400
Subject: [PATCH] [blocky] update blocky for v0.6 (#200)

* update blocky for v0.6

* fix missing port rename

* making service spec more robust

* make defaults sane
---
 charts/blocky/Chart.yaml                    |  4 +--
 charts/blocky/templates/deployment.yaml     |  8 ++---
 charts/blocky/templates/service.yaml        | 33 +++++++++++++++++++--
 charts/blocky/templates/servicemonitor.yaml |  2 +-
 charts/blocky/values.yaml                   | 13 ++++++--
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/charts/blocky/Chart.yaml b/charts/blocky/Chart.yaml
index e866aa37..d096bc51 100644
--- a/charts/blocky/Chart.yaml
+++ b/charts/blocky/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "v0.5"
+appVersion: "v0.6"
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 2.2.2
+version: 2.3.0
 keywords:
   - blocky
   - dbs
diff --git a/charts/blocky/templates/deployment.yaml b/charts/blocky/templates/deployment.yaml
index 457aca6d..0bc32207 100644
--- a/charts/blocky/templates/deployment.yaml
+++ b/charts/blocky/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
               readOnly: true
           ports:
           ports:
-            - name: monitoring
+            - name: api
               containerPort: 4000
             - name: dns
               containerPort: 53
@@ -51,19 +51,19 @@ spec:
           livenessProbe:
             httpGet:
               path: /metrics
-              port: monitoring
+              port: api
             failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
             periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
           readinessProbe:
             httpGet:
               path: /metrics
-              port: monitoring
+              port: api
             failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
             periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
           startupProbe:
             httpGet:
               path: /metrics
-              port: monitoring
+              port: api
             initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
             failureThreshold: {{ .Values.probes.startup.failureThreshold }}
             periodSeconds: {{ .Values.probes.startup.periodSeconds }}
diff --git a/charts/blocky/templates/service.yaml b/charts/blocky/templates/service.yaml
index ebb479c0..a2abcbd3 100644
--- a/charts/blocky/templates/service.yaml
+++ b/charts/blocky/templates/service.yaml
@@ -7,12 +7,39 @@ metadata:
     helm.sh/chart: {{ include "blocky.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
 spec:
-  clusterIP: None
+{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
+  type: ClusterIP
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{end}}
+{{- else if eq .Values.service.type "LoadBalancer" }}
+  type: {{ .Values.service.type }}
+  {{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
+  {{- end -}}
+{{- else }}
+  type: {{ .Values.service.type }}
+{{- end }}
+{{- if .Values.service.externalIPs }}
+  externalIPs:
+{{ toYaml .Values.service.externalIPs | indent 4 }}
+{{- end }}
+  {{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
   ports:
-  - name: monitoring
+  - name: api
     port: 4000
-    targetPort: monitoring
+    targetPort: api
   selector:
     app.kubernetes.io/name: {{ include "blocky.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/charts/blocky/templates/servicemonitor.yaml b/charts/blocky/templates/servicemonitor.yaml
index 1e908964..82c553d2 100644
--- a/charts/blocky/templates/servicemonitor.yaml
+++ b/charts/blocky/templates/servicemonitor.yaml
@@ -17,7 +17,7 @@ spec:
       app.kubernetes.io/name: {{ include "blocky.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
-  - port: monitoring
+  - port: api
     interval: 30s
     path: /metrics
 {{- end }}
diff --git a/charts/blocky/values.yaml b/charts/blocky/values.yaml
index a5f57d79..ce5deb60 100644
--- a/charts/blocky/values.yaml
+++ b/charts/blocky/values.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 image:
   repository: spx01/blocky
-  tag: v0.5
+  tag: v0.6
   pullPolicy: IfNotPresent
 
 nameOverride: ""
@@ -119,6 +119,15 @@ probes:
     failureThreshold: 30
     periodSeconds: 10
 
+service:
+  type: ClusterIP
+  # externalTrafficPolicy: Local
+  # loadBalancerIP: ""
+    # a fixed LoadBalancer IP
+  annotations: {}
+    # metallb.universe.tf/address-pool: network-services
+    # metallb.universe.tf/allow-shared-ip: blocky-svc
+
 serviceTCP:
   enabled: false
   type: NodePort
@@ -146,7 +155,7 @@ serviceMonitor:
 ## Pod Annotations
 podAnnotations:
   prometheus.io/scrape: "true"
-  prometheus.io/port: "monitoring"
+  prometheus.io/port: "api"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious