diff --git a/charts/blocky/Chart.yaml b/charts/blocky/Chart.yaml index bb972d53..e479c90f 100644 --- a/charts/blocky/Chart.yaml +++ b/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 diff --git a/charts/blocky/templates/NOTES.txt b/charts/blocky/templates/NOTES.txt index 6c3337cb..1a17a0cd 100644 --- a/charts/blocky/templates/NOTES.txt +++ b/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 diff --git a/charts/blocky/templates/service-prometheus.yaml b/charts/blocky/templates/service-prometheus.yaml index 169c71ec..f7aff721 100644 --- a/charts/blocky/templates/service-prometheus.yaml +++ b/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 diff --git a/charts/blocky/templates/service-tcp.yaml b/charts/blocky/templates/service-tcp.yaml index b2d7ebd6..e01b1e02 100644 --- a/charts/blocky/templates/service-tcp.yaml +++ b/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 }} diff --git a/charts/blocky/templates/service-udp.yaml b/charts/blocky/templates/service-udp.yaml index 1f0eacd6..934d3725 100644 --- a/charts/blocky/templates/service-udp.yaml +++ b/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 }} diff --git a/charts/blocky/values.yaml b/charts/blocky/values.yaml index d8dc4fc1..f26ab48f 100644 --- a/charts/blocky/values.yaml +++ b/charts/blocky/values.yaml @@ -132,10 +132,6 @@ probes: failureThreshold: 30 periodSeconds: 10 -service: - type: ClusterIP - port: 53 - serviceTCP: enabled: false type: NodePort