Merge pull request #1 from crugroup/develop

Release 0.2.0

Chart.yaml

@@ -2,10 +2,10 @@ apiVersion: v1
 description: Spade Helm Chart
 name: spade
 type: application
-version: 0.0.1
+version: 0.2.0
 appVersion: 0.1.0
 dependencies:
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami
-    version: 14.0.4
+    version: 15.2.5
     condition: postgresql.enabled

templates/django-configmap.yaml

@@ -11,12 +11,13 @@ data:
   POSTGRES_DB: "{{ .Values.postgresql.auth.database }}"
   POSTGRES_PASSWORD: "{{ .Values.postgresql.auth.password }}"
   DJANGO_ADMIN_URL: "{{ .Values.spade.django.adminUrl }}"
-  DJANGO_ALLOWED_HOSTS: "{{ .Values.spade.django.allowedHosts }}"
-  FRONTEND_EXTERNAL_URL: "{{ .Values.spadeUI.webserver.publicDomain }}"
+  DJANGO_ALLOWED_HOSTS: "{{ .Values.ingress.spade.host }}"
+  FRONTEND_EXTERNAL_URL: "https://{{ .Values.ingress.spadeUI.host }}"
   DJANGO_COLLECTFAST_STRATEGY: "{{ .Values.spade.django.collectFastStrategy }}"
   DJANGO_SECRET_KEY: "{{ .Values.spade.django.secretKey }}"
   DJANGO_SETTINGS_MODULE: "{{ .Values.spade.django.settingsModule }}"
   DJANGO_SECURE_SSL_REDIRECT: "{{ .Values.spade.django.ssl.redirect }}"
+  DJANGO_SITE_DOMAIN: "{{ .Values.ingress.spadeUI.host }}"
   FIELD_ENCRYPTION_KEY: "{{ .Values.spade.django.fieldEncryptionKey }}"
   {{- range $setting, $option := .Values.environment }}
   {{ $setting }}: "{{ $option }}"

templates/django-deployment.yaml

@@ -27,6 +27,11 @@ spec:
         envFrom:
           - configMapRef:
               name: "{{ template "spade.name" . }}-env"
+        env:
+          {{- range .Values.spade.env }}
+          - name: {{ .name }}
+            value: {{ .value | quote }}
+          {{- end }}
         image: {{ template "spade.image" . }}
         imagePullPolicy: {{ .Values.spade.pullPolicy }}
         name: spade

templates/ui-configmap.yaml

@@ -3,9 +3,9 @@ kind: ConfigMap
 metadata:
   name: "{{ template "spade.name" . }}-ui-env"
   labels:
-    app: "{{ template "spade.name" . }}-ui"
+    app: spade-ui
 data:
-  VITE_BACKEND_BASE_URL: "{{ .Values.spade.django.apiUrl }}"
+  VITE_BACKEND_BASE_URL: "https://{{ .Values.ingress.spade.host }}/api/v1"
   {{- range $setting, $option := .Values.environment }}
   {{ $setting }}: "{{ $option }}"
   {{- end }}

templates/ui-deployment.yaml

@@ -26,6 +26,13 @@ spec:
         envFrom:
           - configMapRef:
               name: "{{ template "spade.name" . }}-env"
+        env:
+          - name: VITE_BACKEND_BASE_URL
+            value: "https://{{ .Values.ingress.spade.host }}/api/v1"
+          {{- range .Values.spadeUI.env }}
+          - name: {{ .name }}
+            value: {{ .value | quote }}
+          {{- end }}
         image: {{ template "spadeUI.image" . }}
         imagePullPolicy: {{ .Values.spadeUI.pullPolicy }}
         name: "{{ template "spade.name" . }}-ui"

values.yaml

@@ -8,9 +8,8 @@ docker:
 
 
 spade:
+  env: []
   django:
-    apiUrl: https://backend/api/v1
-    allowedHosts: backend
     adminUrl: admin/
     collectFastStrategy: collectfast.strategies.filesystem.FileSystemStrategy
     settingsModule: config.settings.production
@@ -23,10 +22,9 @@ spade:
   nodeSelector: {}
   resources: {}
 
+
 spadeUI:
-  webserver:
-    publicDomain: https://frontend
-
+  env: []
   pullPolicy: Always
   nodeSelector: {}
   resources: {}