Helm chart: Integrate common library for Deployments. #418

UffizziCloud · May 24, 2023 · 30c90ca · 30c90ca
1 parent ec6852c
commit 30c90ca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/charts/uffizzi-app/Chart.yaml b/charts/uffizzi-app/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/UffizziCloud/uffizzi
 dependencies:
   - name: common
-    repository: oci://registry-1.docker.io/bitnamicharts
+    repository: https://charts.bitnami.com/bitnami
     tags:
       - bitnami-common
     version: 2.x.x

diff --git a/charts/uffizzi-app/templates/configmap-common.yaml b/charts/uffizzi-app/templates/configmap-common.yaml
@@ -11,6 +11,6 @@ data:
   CONTROLLER_URL: {{ default (print "http://" .Release.Name "-controller:8080") .Values.controller_url }}
   EMAIL_DELIVERY_ENABLED: {{ .Values.feature_email_delivery | quote }}
   MANAGED_DNS_ZONE_DNS_NAME: {{ .Values.managed_dns_zone_dns_name | quote }}
-  UFFIZZI_USER_EMAIL: {{ .Values.global.uffizzi.firstUser.email }}
+  UFFIZZI_USER_EMAIL: {{ .Values.global.uffizzi.firstUser.email | quote }}
   UFFIZZI_USER_PASSWORD: {{ .Values.global.uffizzi.firstUser.password | quote }}
   UFFIZZI_PROJECT_NAME: {{ .Values.global.uffizzi.firstUser.projectName | quote }}
diff --git a/charts/uffizzi-app/templates/sidekiq-deployment.yaml b/charts/uffizzi-app/templates/sidekiq-deployment.yaml
@@ -1,8 +1,9 @@
-apiVersion: apps/v1
+apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-sidekiq
-  labels:
+  name: {{ include "common.names.fullname" . }}-sidekiq
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{ include "common.labels.standard" . | nindent 4 }}
     app: uffizzi-sidekiq
 
 spec:
@@ -17,9 +18,11 @@ spec:
         app: uffizzi-sidekiq
     spec:
       automountServiceAccountToken: false
+      {{- include "sidekiq.renderImagePullSecrets" . | nindent 6 }}
       containers:
       - name: uffizzi-sidekiq
-        image: {{ .Values.sidekiq.image }}
+        image: {{ include "sidekiq.image" . }}
+        imagePullPolicy: {{ .Values.sidekiq.image.pullPolicy }}
         command:
         - /bin/bash
         - -c

diff --git a/charts/uffizzi-app/templates/web-deployment.yaml b/charts/uffizzi-app/templates/web-deployment.yaml
@@ -1,8 +1,9 @@
-apiVersion: apps/v1
+apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-web
-  labels:
+  name: {{ include "common.names.fullname" . }}-web
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{ include "common.labels.standard" . | nindent 4 }}
     app: uffizzi-web
 
 spec:
@@ -17,9 +18,11 @@ spec:
         app: uffizzi-web
     spec:
       automountServiceAccountToken: false
+      {{- include "web.renderImagePullSecrets" . | nindent 6 }}
       containers:
       - name: uffizzi-web
-        image: {{ .Values.web.image }}
+        image: {{ include "web.image" . }}
+        imagePullPolicy: {{ .Values.web.image.pullPolicy }}
         command:
         - /bin/bash
         - -c