Merge pull request #56 from ConductionNL/staging

Popd-up php replica's to 3
ConductionNL · Dec 10, 2019 · ab366a3 · ab366a3
2 parents f9875ae + 06bc6bc
commit ab366a3
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/api/helm/templates/configmap.yaml b/api/helm/templates/configmap.yaml
@@ -25,6 +25,13 @@ data:
   app-health: {{ .Values.settings.healthEnabled | quote }}
   app-archive: {{ .Values.settings.archiveEnabled | quote }}
 
+  organization-name: {{ .Values.settings.organisationMame | quote }}
+  organization-email: {{ .Values.settings.email | quote }}
+  organization-country: {{ .Values.settings.country | quote }}
+  organization-state: {{ .Values.settings.state | quote }}
+  organization-locality: {{ .Values.settings.locality | quote }}
+  organization-unit: {{ .Values.settings.unit | quote }}
+
   env: {{ .Values.settings.env | quote }}
   debug: {{ .Values.settings.debug | quote }}
   cors-allow-origin: {{ .Values.settings.corsAllowOrigin | quote }}

diff --git a/api/helm/templates/php-deployment.yaml b/api/helm/templates/php-deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.php.replicaCount }}
+  replicas: 3
   template:
     metadata:
       labels:
@@ -82,11 +82,37 @@ spec:
                 configMapKeyRef:
                   name: {{ template "fullname" . }}
                   key: app-domain
-            - name: APP_REPRO
+            # organization
+            - name: ORGANIZATION_NAME
               valueFrom:
                 configMapKeyRef:
                   name: {{ template "fullname" . }}
-                  key: app-repro
+                  key: organization-name
+            - name: ORGANIZATION_EMAIL_ADDRESS
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: organization-email
+            - name: ORGANIZATION_COUNTRY_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: organization-country
+            - name: ORGANIZATION_STATE
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: organization-state
+            - name: ORGANIZATION_LOCALITY
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: organization-locality
+            - name: ORGANIZATION_UNIT_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: organization-unit
             # config
             - name: AUTH_ENABLED
               valueFrom:

diff --git a/api/templates/helm/Values.yaml.twig b/api/templates/helm/Values.yaml.twig
@@ -10,8 +10,13 @@ settings:
   version: {{ app_version }}
   description: '{{ app_description }}'
   repro: '{{ app_repro }}'
-  domain: {{ app_domain }}
+  domain: {{ app_domain }}  
+  organisationName: {{ organization_name }}
   email: {{ organization_email }}
+  country: {{ organization_country }}
+  state: {{ organization_state }}
+  locality: {{ organization_locality }}
+  unit: {{ unit }}  
   demo: {{ app_demo }}
   env: {{ app_env }}
   debug: {{ app_debug }}