Unverified Commit ee644ca0 authored by Matt Pryor's avatar Matt Pryor Committed by GitHub
Browse files

Merge pull request #130 from ESGF/issue/129/custom-labels 

Global custom labels
parents 801308a8 798353fe

deploy/kubernetes/chart/templates/_helpers.tpl

+11 −1
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ If the release name contains the chart or component name, it is not duplicated. 
{{- end -}}



{{/*

Common labels for a component.

Common labels for a component. The context should be a list consisting of:



  * Top context

  * Component name

  * Component-specific extra labels (optional)

*/}}

{{- define "esgf.component.labels" -}}

{{- $context := index . 0 -}}
@@ -32,6 +36,12 @@ app.kubernetes.io/version: {{ $context.Chart.AppVersion | quote }} 
{{- end }}

app.kubernetes.io/managed-by: {{ $context.Release.Service }}

{{ include "esgf.component.selectorLabels" . }}

{{- with $context.Values.globalLabels }}

{{ toYaml . }}

{{- end }}

{{- with (index . 2) }}

{{ toYaml . }}

{{- end }}

{{- end -}}



{{/*

deploy/kubernetes/chart/templates/fileServer/configmap.yaml

+3 −2
Original line number Diff line number Diff line 
{{- if .Values.data.fileServer.enabled -}}

{{- $fileServer := .Values.data.fileServer -}}

{{- if $fileServer.enabled -}}

apiVersion: v1

kind: ConfigMap

metadata:

  name: {{ include "esgf.component.fullname" (list . "fileServer") }}

  labels: {{ include "esgf.component.labels" (list . "fileServer") | nindent 4 }}

  labels: {{ include "esgf.component.labels" (list . "fileServer" $fileServer.labels) | nindent 4 }}

data:

  datasets.conf: {{ tpl (.Files.Get "files/fileServer/datasets.conf") . | quote }}

{{- end -}}

deploy/kubernetes/chart/templates/fileServer/deployment.yaml

+2 −2
Original line number Diff line number Diff line 
{{- if .Values.data.fileServer.enabled -}}

{{- $fileServer := .Values.data.fileServer -}}

{{- if $fileServer.enabled -}}

apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ include "esgf.component.fullname" (list . "fileServer") }}

  labels: {{ include "esgf.component.labels" (list . "fileServer") | nindent 4 }}

  labels: {{ include "esgf.component.labels" (list . "fileServer" $fileServer.labels) | nindent 4 }}

spec:

  {{- if not $fileServer.hpa }}

  replicas: {{ $fileServer.replicaCount }}

deploy/kubernetes/chart/templates/fileServer/hpa.yaml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ apiVersion: autoscaling/v2beta2 
kind: HorizontalPodAutoscaler

metadata:

  name: {{ include "esgf.component.fullname" (list . "fileServer") }}

  labels: {{ include "esgf.component.labels" (list . "fileServer") | nindent 4 }}

  labels: {{ include "esgf.component.labels" (list . "fileServer" $fileServer.labels) | nindent 4 }}

spec:

  scaleTargetRef:

    apiVersion: apps/v1

deploy/kubernetes/chart/templates/fileServer/service.yaml

+3 −2
Original line number Diff line number Diff line 
{{- if .Values.data.fileServer.enabled -}}

{{- $fileServer := .Values.data.fileServer -}}

{{- if $fileServer.enabled -}}

apiVersion: v1

kind: Service

metadata:

  name: {{ include "esgf.component.fullname" (list . "fileServer") }}

  labels: {{ include "esgf.component.labels" (list . "fileServer") | nindent 4 }}

  labels: {{ include "esgf.component.labels" (list . "fileServer" $fileServer.labels) | nindent 4 }}

spec:

  type: ClusterIP

  ports: