master-group/charts
2
0
Fork 0
mirror of https://github.com/k8s-at-home/charts.git synced 2025-01-24 16:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[common] 1.6.1 (#191)

Browse Source
This commit is contained in:
Bernd Schörgers 2020-11-23 15:10:29 +01:00 committed by GitHub
parent 8bc2923281
commit 0c99fb1339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/common/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v2
name: common name: common
description: Function library for k8s-at-home charts description: Function library for k8s-at-home charts
type: library type: library
version: 1.6.0 version: 1.6.1
keywords: keywords:
- k8s-at-home - k8s-at-home
- common - common

4
charts/common/templates/_daemonset.tpl
View File

@ -53,8 +53,10 @@ spec:
{{- with .Values.additionalContainers }} {{- with .Values.additionalContainers }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- with (include "common.controller.volumes" . | trim) }}
volumes: volumes:
{{- include "common.controller.volumes" . | trim | nindent 6 }} {{- . | nindent 6 }}
{{- end }}
{{- with .Values.hostAliases }} {{- with .Values.hostAliases }}
hostAliases: hostAliases:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

6
charts/common/templates/_deployment.tpl
View File

@ -58,10 +58,10 @@ spec:
{{- with .Values.additionalContainers }} {{- with .Values.additionalContainers }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- with (include "common.controller.volumes" . | trim) }}
volumes: volumes:
{{- include "common.controller.volumes" . | trim | nindent 6 }} {{- . | nindent 6 }}
{{- end }}
{{- with .Values.hostAliases }} {{- with .Values.hostAliases }}
hostAliases: hostAliases:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

6
charts/common/templates/_statefulset.tpl
View File

@ -53,10 +53,10 @@ spec:
{{- with .Values.additionalContainers }} {{- with .Values.additionalContainers }}
{{- toYaml . | nindent 6 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- with (include "common.controller.volumes" . | trim) }}
volumes: volumes:
{{- include "common.controller.volumes" . | trim | nindent 6 }} {{- . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

7
charts/common/templates/lib/controller/_ports.tpl
View File

@ -7,6 +7,7 @@ Ports included by the controller.
{{- $serviceValues := deepCopy . -}} {{- $serviceValues := deepCopy . -}}
{{/* append the ports for the main service */}} {{/* append the ports for the main service */}}
{{- if .enabled -}} {{- if .enabled -}}
{{- $_ := set .port "name" (default "http" .port.name) -}}
{{- $ports = mustAppend $ports .port -}} {{- $ports = mustAppend $ports .port -}}
{{- range $_ := .additionalPorts -}} {{- range $_ := .additionalPorts -}}
{{/* append the additonalPorts for the main service */}} {{/* append the additonalPorts for the main service */}}
@ -16,6 +17,7 @@ Ports included by the controller.
{{/* append the ports for each additional service */}} {{/* append the ports for each additional service */}}
{{- range $_ := .additionalServices }} {{- range $_ := .additionalServices }}
{{- if .enabled -}} {{- if .enabled -}}
{{- $_ := set .port "name" (required "Missing port.name" .port.name) -}}
{{- $ports = mustAppend $ports .port -}} {{- $ports = mustAppend $ports .port -}}
{{- range $_ := .additionalPorts -}} {{- range $_ := .additionalPorts -}}
{{/* append the additonalPorts for each additional service */}} {{/* append the additonalPorts for each additional service */}}
@ -24,12 +26,13 @@ Ports included by the controller.
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{/* export/render the list of ports */}} {{/* export/render the list of ports */}}
{{- if $ports -}} {{- if $ports -}}
ports: ports:
{{- range $_ := $ports }} {{- range $_ := $ports }}
- name: {{ required "Missing port.name" .name }} - name: {{ .name }}
containerPort: {{ required "Missing port.port" .port }} containerPort: {{ .port }}
protocol: {{ .protocol | default "TCP" }} protocol: {{ .protocol | default "TCP" }}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}