Merge pull request #114 from gimlet-io/merge

Merge
gimlet-io · Dec 20, 2023 · 78d23b1 · 78d23b1
2 parents d27b401 + 35231e6
commit 78d23b1
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 139 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -15,4 +15,4 @@ type: library
 # 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: 0.4.1
+version: 0.5.0
diff --git a/charts/common/templates/_container.yaml b/charts/common/templates/_container.yaml
@@ -0,0 +1,54 @@
+{{- define "common.container.tpl" -}}
+name: {{ template "robustName" .Release.Name }}
+securityContext:
+  {{- toYaml .Values.securityContext | nindent 2 }}
+image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+imagePullPolicy: {{ .Values.image.pullPolicy }}
+{{- if .Values.command }}
+command:
+  - {{ .Values.shell }}
+  - -c
+  - {{ .Values.command | quote }}
+{{- end }}
+ports:
+  {{- if not .Values.ports }}
+  - name: http
+    containerPort: {{ .Values.containerPort }}
+    protocol: TCP
+  {{- else }}
+  {{- range .Values.ports }}
+  - name: {{ .name }}
+    containerPort: {{ .containerPort }}
+    protocol: TCP
+  {{- end }}
+  {{- end }}
+{{- if .Values.probe.enabled }}
+readinessProbe:
+  httpGet:
+    path: {{ .Values.probe.path }}
+    port: {{ .Values.containerPort }}
+    scheme: HTTP
+  {{- with .Values.probe.settings }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- if .Values.livenessProbe.enabled }}
+livenessProbe:
+  httpGet:
+    path: {{ .Values.livenessProbe.path }}
+    port: {{ .Values.containerPort }}
+    scheme: HTTP
+  {{- with .Values.livenessProbe.settings }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- if not .Values.resources.ignore }}
+resources:
+  {{- if .Values.resources.ignoreLimits }}
+  requests:
+    {{- toYaml .Values.resources.requests | nindent 4 }}
+  {{- else }}
+    {{- toYaml .Values.resources | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/common/templates/_podSpec.yaml b/charts/common/templates/_podSpec.yaml
@@ -0,0 +1,80 @@
+{{- define "common.podSpec.tpl" -}}
+{{- with .Values.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+securityContext:
+  {{- toYaml .Values.podSecurityContext | nindent 2 }}
+{{- if .Values.serviceAccount }}
+serviceAccountName: {{ .Values.serviceAccount }}
+{{- end }}
+initContainers:
+  {{- range .Values.initContainers }}  
+  - name:  {{ .name }}
+    image: "{{ .image }}:{{ .tag }}"
+    imagePullPolicy: {{ .imagePullPolicy | default "IfNotPresent" }}
+    {{- if .command }}
+    command:
+      - {{ $.Values.shell }}
+      - -c
+      - {{ .command | quote}} 
+    {{- end }}
+    volumeMounts:
+    {{- range $.Values.volumes }}  
+    {{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
+    - mountPath: {{ .path }}
+      name: {{ .name }}
+    {{- end }}
+    {{- end }}
+    {{- if .securityContext }}
+    securityContext:
+    {{- toYaml .securityContext | nindent 6 }}
+    {{- end}}
+  {{- end }}      
+containers:
+  {{- $containerTpl := include "common.container.tpl" . | fromYaml }}
+  {{- $container := mergeOverwrite $containerTpl .Values.container }}
+  - {{ toYaml $container | nindent 4 }}
+    {{- include "common.envFromRef.tpl" . | nindent 4 }}
+    {{- include "common.volumeMountsRef.tpl" . | nindent 4 }}
+  {{- if .Values.sidecar }}
+  - name: {{ template "robustName" .Release.Name }}-sidecar
+    securityContext:
+      {{- toYaml .Values.securityContext | nindent 6 }}
+    image: {{ .Values.sidecar.repository }}:{{ .Values.sidecar.tag }}
+    {{- if .Values.sidecar.command }}
+    command:
+      - {{ .Values.sidecar.shell }}
+      - -c
+      - {{ .Values.sidecar.command | quote }}
+    {{- end }}
+    {{- include "common.envFromRef.tpl" . | nindent 4 }}
+    {{- include "common.volumeMountsRef.tpl" . | nindent 4 }}
+  {{- end }}
+{{- include "common.volumesRef.tpl" . }}
+{{- with .Values.nodeSelector }}
+nodeSelector:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- if or .Values.spreadAcrossNodes .Values.affinity }}
+affinity:
+  {{- if .Values.spreadAcrossNodes }}
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+            - key: "app.kubernetes.io/instance"
+              operator: In
+              values:
+                - {{ template "robustName" .Release.Name }}
+        topologyKey: "kubernetes.io/hostname"
+  {{- end }}
+  {{- if .Values.affinity }}
+  {{- toYaml .Values.affinity | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- with .Values.tolerations }}
+tolerations:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/charts/common/templates/_volumesRef.yaml b/charts/common/templates/_volumesRef.yaml
@@ -1,5 +1,5 @@
-{{- define "common.volumesRef.tpl" -}}
-{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
+{{- define "common.volumesRef.tpl" }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
 volumes:
   {{- range .Values.volumes }}
   - name: {{ .name }}
@@ -42,4 +42,4 @@ volumes:
       secretName: {{ .name }}
   {{- end }}
 {{- end }}
-{{- end -}}
+{{- end }}
diff --git a/charts/cron-job/Chart.lock b/charts/cron-job/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.4.0
-digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb
-generated: "2023-10-20T10:53:13.982995773+02:00"
+  version: 0.5.0
+digest: sha256:30d2b6050fd6d3ce739c4a1b549f16713ad778669467e767ddf1fc67bc1114d4
+generated: "2023-12-18T16:50:56.069352+01:00"
diff --git a/charts/cron-job/Chart.yaml b/charts/cron-job/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.63.0
 
 dependencies:
   - name: common
-    version: 0.4.1
+    version: 0.5.0
     repository: file://../common
diff --git a/charts/cron-job/charts/common-0.4.0.tgz b/charts/cron-job/charts/common-0.4.0.tgz
diff --git a/charts/cron-job/charts/common-0.5.0.tgz b/charts/cron-job/charts/common-0.5.0.tgz
diff --git a/charts/onechart/Chart.lock b/charts/onechart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.4.0
-digest: sha256:d4eccd332ada7362f429e04b82022f5605a02e2d3aa7b9fdf8adaf4f6c9e03eb
-generated: "2023-10-20T10:52:47.237955041+02:00"
+  version: 0.5.0
+digest: sha256:30d2b6050fd6d3ce739c4a1b549f16713ad778669467e767ddf1fc67bc1114d4
+generated: "2023-12-18T13:46:34.090227+01:00"
diff --git a/charts/onechart/Chart.yaml b/charts/onechart/Chart.yaml
@@ -19,5 +19,5 @@ version: 0.63.0
 
 dependencies:
   - name: common
-    version: 0.4.1
+    version: 0.5.0
     repository: file://../common
diff --git a/charts/onechart/charts/common-0.4.0.tgz b/charts/onechart/charts/common-0.4.0.tgz
diff --git a/charts/onechart/charts/common-0.5.0.tgz b/charts/onechart/charts/common-0.5.0.tgz
diff --git a/charts/onechart/templates/deployment.yaml b/charts/onechart/templates/deployment.yaml
@@ -44,130 +44,6 @@ spec:
         {{- end }}
         {{- include "helm-chart.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if .Values.serviceAccount }}
-      serviceAccountName: {{ .Values.serviceAccount }}
-      {{- end }}
-      initContainers:
-        {{- range .Values.initContainers }}  
-        - name:  {{ .name }}
-          image: "{{ .image }}:{{ .tag }}"
-          imagePullPolicy: {{ .imagePullPolicy | default "IfNotPresent" }}
-          {{- if .command }}
-          command:
-            - {{ $.Values.shell }}
-            - -c
-            - {{ .command | quote}} 
-          {{- end }}
-          volumeMounts:
-          {{- range $.Values.volumes }}  
-          {{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
-          - mountPath: {{ .path }}
-            name: {{ .name }}
-          {{- end }}
-          {{- end }}
-          {{- if .securityContext }}
-          securityContext:
-          {{- toYaml .securityContext | nindent 12 }}
-          {{- end}}
-        {{- end }}      
-      containers:
-        - name: {{ template "robustName" .Release.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.command }}
-          command:
-            - {{ .Values.shell }}
-            - -c
-            - {{ .Values.command | quote }}
-          {{- end }}
-          {{- include "common.envFromRef.tpl" . | nindent 10 }}
-          ports:
-            {{- if not .Values.ports }}
-            - name: http
-              containerPort: {{ .Values.containerPort }}
-              protocol: TCP
-            {{- else }}
-            {{- range .Values.ports }}
-            - name: {{ .name }}
-              containerPort: {{ .containerPort }}
-              protocol: TCP
-            {{- end }}
-            {{- end }}
-          {{- if .Values.probe.enabled }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.probe.path }}
-              port: {{ .Values.containerPort }}
-              scheme: HTTP
-            {{- with .Values.probe.settings }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- end }}
-          {{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.livenessProbe.path }}
-              port: {{ .Values.containerPort }}
-              scheme: HTTP
-            {{- with .Values.livenessProbe.settings }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- end }}
-          {{- include "common.volumeMountsRef.tpl" . | nindent 10 }}
-          {{- if not .Values.resources.ignore }}
-          resources:
-            {{- if .Values.resources.ignoreLimits }}
-            requests:
-              {{- toYaml .Values.resources.requests | nindent 14 }}
-            {{- else }}
-             {{- toYaml .Values.resources | nindent 12 }}
-            {{- end }}
-          {{- end }}
-        {{- if .Values.sidecar }}
-        - name: {{ template "robustName" .Release.Name }}-sidecar
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: {{ .Values.sidecar.repository }}:{{ .Values.sidecar.tag }}
-          {{- if .Values.sidecar.command }}
-          command:
-            - {{ .Values.sidecar.shell }}
-            - -c
-            - {{ .Values.sidecar.command | quote }}
-          {{- end }}
-          {{- include "common.envFromRef.tpl" . | nindent 10 }}
-          {{- include "common.volumeMountsRef.tpl" . | nindent 10 }}
-        {{- end }}
-      {{- include "common.volumesRef.tpl" . | nindent 6 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if or .Values.spreadAcrossNodes .Values.affinity }}
-      affinity:
-        {{- if .Values.spreadAcrossNodes }}
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: "app.kubernetes.io/instance"
-                    operator: In
-                    values:
-                      - {{ template "robustName" .Release.Name }}
-              topologyKey: "kubernetes.io/hostname"
-        {{- end }}
-        {{- if .Values.affinity }}
-        {{- toYaml .Values.affinity | nindent 8 }}
-        {{- end }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- $podSpecTpl := include "common.podSpec.tpl" . | fromYaml }}
+      {{- $podSpec := mergeOverwrite $podSpecTpl .Values.podSpec }}
+      {{- toYaml $podSpec | nindent 6 }}
diff --git a/charts/onechart/tests/deployment_merge_test.yaml b/charts/onechart/tests/deployment_merge_test.yaml
@@ -0,0 +1,14 @@
+suite: test deployment
+templates:
+  - deployment.yaml
+  - configmap.yaml
+tests:
+  - it: Should add hostNetwork
+    set:
+      podSpec:
+        hostNetwork: true
+    asserts:
+      - template: deployment.yaml
+        equal:
+          path: spec.template.spec.hostNetwork
+          value: true
diff --git a/charts/onechart/values.yaml b/charts/onechart/values.yaml
@@ -77,3 +77,6 @@ nodePortEnabled: false
 # Set true to enable service monitor.
 monitor:
   enabled: false
+
+container: {}
+podSpec: {}
diff --git a/values.yaml b/values.yaml
@@ -18,3 +18,11 @@ volumes:
 vars:
   var1: value1
   var2: value2
+
+probe:
+  enabled: true
+  settings:
+    periodSeconds: 30
+
+podSpec:
+  hostNetwork: true