diff --git a/charts/apexkube/Chart.yaml b/charts/apexkube/Chart.yaml index 4698dc1..ae2bf99 100644 --- a/charts/apexkube/Chart.yaml +++ b/charts/apexkube/Chart.yaml @@ -5,4 +5,4 @@ maintainers: - name: improwised name: "apexkube" type: application -version: 1.2.0 +version: 1.3.0 diff --git a/charts/apexkube/templates/service.yaml b/charts/apexkube/templates/service.yaml index e358ac4..535b2f8 100644 --- a/charts/apexkube/templates/service.yaml +++ b/charts/apexkube/templates/service.yaml @@ -134,7 +134,7 @@ spec: {{- if $.Values.serviceTemplate.volumeMounts }} {{ toYaml $.Values.serviceTemplate.volumeMounts | indent 10 }} {{- end }} - {{- if or ($.Values.serviceTemplate.healthcheck.enabled) (.healthcheck.enabled) }} + {{- if or ($.Values.serviceTemplate.healthcheck.enabled) (and .healthcheck .healthcheck.enabled) }} {{- if .healthcheck }} {{- $healthType := .healthcheck.type -}} {{- if and (eq $healthType "httpGet") (.healthcheck.path ) }} @@ -195,6 +195,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if or ($.Values.serviceTemplate.additionalContainers) (.additionalContainers) }} + {{- if .additionalContainers }} + {{- if $.Values.serviceTemplate.additionalContainers }} +{{ toYaml $.Values.serviceTemplate.additionalContainers | indent 8 }} + {{- end }} +{{ toYaml .additionalContainers | indent 8 }} + {{- else }} +{{ toYaml $.Values.serviceTemplate.additionalContainers | indent 8 }} + {{- end }} + {{- end }} {{- with .dnsConfig | default $.Values.serviceTemplate.dnsConfig }} dnsConfig: {{ toYaml . | indent 8 }} diff --git a/charts/apexkube/values.yaml b/charts/apexkube/values.yaml index c7d8b52..8eedd72 100644 --- a/charts/apexkube/values.yaml +++ b/charts/apexkube/values.yaml @@ -45,6 +45,13 @@ serviceTemplate: initContainers: [] + ## additionalContainers: + ## - name: sidecar + ## image: busybox:latest + ## command: ['sh', '-c', 'echo hello'] + + additionalContainers: [] + lifecycleHooks: {} healthcheck: