Merge branch 'staging'

api/helm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 appVersion: V.0.1
-name: cgui
 description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
+name: cgui
 version: 0.1.0
 home: https://common-ground.dev
 icon: https://common-ground.dev/logo-250x250.png

api/helm/templates/certificate.yaml

@@ -1,9 +1,9 @@
 apiVersion: cert-manager.io/v1alpha2
 kind: Certificate
 metadata:
-  name: {{ include "name" . }}-acme-cert
+  name: {{ include "name" . }}-{{ .Values.settings.env }}-cert
 spec:
-  secretName: {{ include "name" . }}-tls-cert
+  secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
   duration: 24h
   renewBefore: 12h
   {{- if eq .Values.settings.env "prod" }}

api/helm/templates/ingress.yaml

@@ -20,7 +20,7 @@ spec:
   tls: 
   - hosts:
     - {{ .Values.settings.domain }}
-    secretName: {{ include "name" . }}-tls-cert
+    secretName: {{ include "name" . }}-{{ .Values.settings.env }}-cert
   rules:
 #    - host: {{ .Values.settings.name }}.{{ .Values.settings.env }}.{{ .Values.settings.domain }}
 #      http:

api/helm/values.yaml

@@ -10,14 +10,14 @@ settings:
   version: V.0.1
   description: ''Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar.''
   repro: 'https://github.com/ConductionNL/commonground-ui'
-  domain: common-ground.dev
-  demo: dev.common-ground.dev
-  unit: Common-Ground  
-  locality: Amsterdam
-  country: Netherlands
+  domain: common-ground.dev  
+  organisationName: Conduction
   email: [email protected]
+  country: Netherlands
   state: Noord-Holland
-  organisationName: Conduction
+  locality: Amsterdam
+  unit: Common-Ground  
+  demo: dev.common-ground.dev
   env: dev
   debug: 1
   replicaCount: 1