UNSO-1979: add initContainers to UGC (#150)

* UNSO-1979: add initContainers to UGC

* UNSO-1979: add value render template

Author: schwerlaut

charts/sophora-ugc/Chart.yaml

@@ -15,7 +15,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.0.4
+version: 2.0.5
 
 # 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

charts/sophora-ugc/templates/_helpers.tpl

@@ -94,3 +94,16 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "common.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}

charts/sophora-ugc/templates/deployment.yaml

@@ -28,6 +28,10 @@ spec:
       {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      initContainers:
+        {{- if .Values.ugc.extraInitContainers }}
+          {{ include "common.tplvalues.render" (dict "value" .Values.ugc.extraInitContainers "context" $) | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.ugc.image.repository }}:{{ .Values.ugc.image.tag | default .Chart.AppVersion }}"
@@ -80,6 +84,9 @@ spec:
               mountPath: /config/application
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+        {{- if .Values.ugc.extraContainers }}
+          {{ include "common.tplvalues.render" (dict "value" .Values.ugc.extraContainers "context" $) | nindent 8 }}
+        {{- end }}
       volumes:
         - name: application-yml
           configMap:

charts/sophora-ugc/test-values.yaml

@@ -97,6 +97,38 @@ ugc:
     rating:
       primaryTypes: ["sophora-content-nt:story"]
 
+  extraContainers:
+    - name: cloud-sql-proxy
+      image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.10.1
+      args:
+        - "--private-ip"
+        - "--structured-logs"
+        - "--port=<DB_PORT>"
+        - "<INSTANCE_CONNECTION_NAME>"
+
+      securityContext:
+        runAsNonRoot: true
+      resources:
+        requests:
+          memory: "2Gi"
+          cpu: "1"
+
+  extraInitContainers:
+    - name: cloud-sql-proxy
+      image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.10.1
+      args:
+        - "--private-ip"
+        - "--structured-logs"
+        - "--port=<DB_PORT>"
+        - "<INSTANCE_CONNECTION_NAME>"
+
+      securityContext:
+        runAsNonRoot: true
+      resources:
+        requests:
+          memory: "2Gi"
+          cpu: "1"
+
 
 ugcMultimedia:
   enabled: true

charts/sophora-ugc/values.yaml

@@ -100,6 +100,9 @@ ugc:
     database:
       url:
 
+  extraContainers: []
+  extraInitContainers: []
+
 ugcMultimedia:
   enabled: false
   image: