master-group/charts
2
0
Fork 0
mirror of https://github.com/k8s-at-home/charts.git synced 2025-02-03 15:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[blocky] - fix minor issues (#159)

Browse Source 
* remove extraneous service from values

* fix prom service type and port mapping

* allow annotations

* bump chart version

* fix notes file
This commit is contained in:
Jeff Billimek 2020-03-08 12:47:35 -04:00 committed by GitHub
parent 5431d8d4e4
commit 6ff2fcaf27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/blocky/Chart.yaml
View File

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

8
charts/blocky/templates/NOTES.txt
View File

@ -1,14 +1,14 @@
1. Get the application URL by running these commands: 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_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}") export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT 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. 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" . }}' 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}') 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 }} echo http://$SERVICE_IP:{{ .Values.serviceUDP.port }}
{{- else if contains "ClusterIP" .Values.service.type }} {{- 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}") 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" echo "Visit http://127.0.0.1:8080 to use your application"
kubectl port-forward $POD_NAME 8080:80 kubectl port-forward $POD_NAME 8080:80

4
charts/blocky/templates/service-prometheus.yaml
View File

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

4
charts/blocky/templates/service-tcp.yaml
View File

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

4
charts/blocky/templates/service-udp.yaml
View File

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

4
charts/blocky/values.yaml
View File

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