feat(helm): add various parameters

- common labels
- pod selector labels
- pod and container security context
- container resources limits/requests

Signed-off-by: Fatih Acar <[email protected]>

Author: fatih-acar

helm/Chart.yaml

@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.5.0
+version: 2.6.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

helm/templates/_helpers.tpl

@@ -40,6 +40,18 @@ helm.sh/chart: {{ include "infrahub-helm.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if gt (len .Values.global.commonLabels) 0 }}
+{{ .Values.global.commonLabels | toYaml }}
+{{- end }}
+{{- end }}
+
+{{/*
+Common annotations
+*/}}
+{{- define "infrahub-helm.annotations" -}}
+{{- if gt (len .Values.global.commonAnnotations) 0 -}}
+{{ .Values.global.commonAnnotations | toYaml }}
+{{- end }}
 {{- end }}
 
 {{/*
@@ -48,6 +60,9 @@ Selector labels
 {{- define "infrahub-helm.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "infrahub-helm.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if gt (len .Values.global.podLabels) 0 }}
+{{ .Values.global.podLabels | toYaml }}
+{{- end }}
 {{- end }}
 
 {{/*

helm/templates/infrahub-demo-data-job.yaml

@@ -4,8 +4,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-demo-data-job
+  namespace: "{{ .Release.Namespace }}"
   labels:
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   backoffLimit: {{ .Values.infrahubDemoData.backoffLimit }}
   template:

helm/templates/infrahub-git.yaml

@@ -3,9 +3,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-git
+  namespace: "{{ .Release.Namespace }}"
   labels:
     service: infrahub-git
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   replicas: {{ .Values.infrahubGit.replicas | default 1 }}
   selector:
@@ -27,6 +30,9 @@ spec:
       {{- with .Values.infrahubGit.runtimeClassName }}
       runtimeClassName: {{ . }}
       {{- end }}
+      {{- with .Values.infrahubGit.podSecurityContext }}
+      securityContext: {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - args: {{- toYaml .Values.infrahubGit.infrahubGit.args | nindent 12 }}
           env:
@@ -43,7 +49,12 @@ spec:
           image: {{ default .Values.global.imageRegistry .Values.infrahubGit.infrahubGit.imageRegistry }}/{{ .Values.global.infrahubRepository }}:{{ .Values.global.infrahubTag | default .Chart.AppVersion }}
           imagePullPolicy: {{ default .Values.global.imagePullPolicy .Values.infrahubGit.infrahubGit.imagePullPolicy }}
           name: infrahub-git
-          resources: {}
+          {{- with .Values.infrahubGit.resources }}
+          resources: {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.infrahubGit.infrahubGit.securityContext }}
+          securityContext: {{- toYaml . | nindent 12 }}
+          {{- end }}
           tty: true
           volumeMounts:
             - name: git-data
@@ -65,9 +76,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-git-data
+  namespace: "{{ .Release.Namespace }}"
   labels:
     service: git-data
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   accessModes:
     - {{ .Values.infrahubGit.persistence.accessMode }}

helm/templates/infrahub-server-db-init-job.yaml

@@ -4,8 +4,11 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-server-db-init-job
+  namespace: "{{ .Release.Namespace }}"
   labels:
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   backoffLimit: {{ .Values.infrahubServerDbInitJob.backoffLimit }}
   template:

helm/templates/infrahub-server-ingress.yaml

@@ -4,13 +4,13 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-ingress
+  namespace: "{{ .Release.Namespace }}"
   labels:
-    {{- include "infrahub-helm.labels" . | nindent 4 }}
-  {{- with .Values.infrahubServer.ingress.annotations }}
+  {{- include "infrahub-helm.labels" . | nindent 4 }}
   annotations:
-    {{- range $key, $value := . }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
+  {{- with .Values.infrahubServer.ingress.annotations }}
+  {{- . | toYaml | nindent 4 }}
   {{- end }}
 spec:
   {{- with .Values.infrahubServer.ingress.ingressClassName }}

helm/templates/infrahub-server.yaml

@@ -3,9 +3,12 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-server
+  namespace: "{{ .Release.Namespace }}"
   labels:
     service: infrahub-server
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   replicas: {{ .Values.infrahubServer.replicas | default 1 }}
   selector:
@@ -27,6 +30,9 @@ spec:
       {{- with .Values.infrahubServer.runtimeClassName }}
       runtimeClassName: {{ . }}
       {{- end }}
+      {{- with .Values.infrahubServer.podSecurityContext }}
+      securityContext: {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - args: {{- toYaml .Values.infrahubServer.infrahubServer.args | nindent 12 }}
           env:
@@ -61,7 +67,12 @@ spec:
               name: {{ quote .name }}
           {{- end }}
           {{- end }}
-          resources: {}
+          {{- with .Values.infrahubServer.resources }}
+          resources: {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.infrahubServer.infrahubServer.securityContext }}
+          securityContext: {{- toYaml . | nindent 12 }}
+          {{- end }}
           tty: true
           volumeMounts:
             - mountPath: /opt/infrahub/storage
@@ -82,9 +93,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-server
+  namespace: "{{ .Release.Namespace }}"
   labels:
     service: infrahub-server
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   type: {{ .Values.infrahubServer.type }}
   selector:
@@ -99,9 +113,12 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ include "infrahub-helm.fullname" . }}-infrahub-server-storage-data
+  namespace: "{{ .Release.Namespace }}"
   labels:
     service: infrahub-server-storage-data
   {{- include "infrahub-helm.labels" . | nindent 4 }}
+  annotations:
+  {{- include "infrahub-helm.annotations" . | nindent 4 }}
 spec:
   accessModes:
     - {{ .Values.infrahubServer.persistence.accessMode }}

helm/values.yaml

@@ -3,6 +3,9 @@ global:
   kubernetesClusterDomain: cluster.local
   infrahubRepository: opsmill/infrahub
   imagePullPolicy: IfNotPresent
+  commonLabels: {}
+  commonAnnotations: {}
+  podLabels: {}
 
 # ----------- Cache -----------
 redis:
@@ -57,6 +60,7 @@ infrahubGit:
     size: 100Mi
     accessMode: ReadWriteMany
     storageClassName: nfs
+  resources: {}
   infrahubGit:
     args:
       - infrahub
@@ -80,11 +84,13 @@ infrahubServer:
   ingress:
     enabled: true
     hostname: infrahub-cluster.local
+    annotations:
   persistence:
     enabled: true
     size: 100Mi
     accessMode: ReadWriteMany
     storageClassName: nfs
+  resources: {}
   infrahubServer:
     args:
       - gunicorn