Release version 1.0.0

2023-09-12 15:45:08 +02:00
parent 2604afabb5
commit 0c992a6d46
14 changed files with 445 additions and 418 deletions
--- a/Chart/templates/_helpers.tpl
+++ b/Chart/templates/_helpers.tpl
@@ -3,13 +3,17 @@ Define the application name and fullname
 */}}

 {{- define "..name" -}}
-{{- .Values.site.domain | trunc 63 | replace "." "-" | trimSuffix "-" }}
+{{- .Values.site.name | trunc 63 }}
 {{- end }}

 {{- define "..fullname" -}}
 {{ include "..name" . }}
 {{- end }}

+{{- define  "..domains" }}
+{{- if .Values.site.additionalDomains }}{{ .Values.site.additionalDomains | toYaml }}{{- end }}
+- {{ .Values.site.domain | replace "www." "" }}
+{{- end }} 

 {{- define "..resourcelimits" -}}
 resources:
@@ -38,7 +42,12 @@ app.kubernetes.io/name: {{ include "..name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | trunc 63 | trimSuffix "-" }}
-cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
-cloudyne.systems/site: {{ .Values.site.domain }}
+cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
+cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
+cloudyne.systems/site: {{ .Values.site.domain | quote }}
+{{- end }}
+{{- define "..selector-labels" -}}
+cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
+cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
+cloudyne.systems/site: {{ .Values.site.domain | quote }}
 {{- end }}
--- a/Chart/templates/certificate.yaml
+++ b/Chart/templates/certificate.yaml
@@ -10,13 +10,4 @@ spec:
        kind: ClusterIssuer
    secretName: {{ include "..fullname" . }}-cert-secret
    commonName: {{ .Values.site.url }}
-    dnsNames:
-        - {{ .Values.site.domain | replace "www." "" }}
-        - www.{{ .Values.site.domain | replace "www." "" }}
-        - {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-        - www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-{{- if .Values.site.additionalIngressDomains  }}
-    {{- range .Values.site.additionalIngressDomains }}
-        - {{ . }}
-    {{- end }}
-{{- end }}
+    dnsNames: {{ include "..domains" . | nindent 8 }}
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -5,35 +5,46 @@ metadata:
    labels:
        {{- include "..labels" . | nindent 8 }}
 data:
-    {{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
-    SMTP_PORT: '2525'
-    {{- else }}
-    SMTP_PORT: '587'
+{{- if .Values.email.smtpHost }}
+    SMTP_HOST: {{ .Values.email.smtpHost }}
+{{- end }}
+{{- if .Values.email.smtpPort }}
+    SMTP_PORT: {{ .Values.email.smtpPort | quote }}
+{{- end }}
+{{- if .Values.email.smtpAuth }}
+    SMTP_AUTH: 'True'
+  {{- if .Values.email.smtpUser }}
+    SMTP_USER: {{ .Values.email.smtpUser }}
+  {{- end }}
+  {{- if .Values.email.smtpPassword }}
+    SMTP_PASSWORD: {{ .Values.email.smtpPassword }}
+  {{- end }}
+{{- end }}
+{{- if .Values.email.smtpStarttls }}
    SMTP_STARTTLS: 'True'
-    {{- end }}
-    SMTP_AUTH: 'true'
-    SMTP_FROM: 'customer-noreply@v3.nu'
-        {{- if .Values.email }}
-            {{- if .Values.email.forceFromEmail }}
-    SMTP_FORCE_FROM: {{ .Values.email.forceFromEmail }}
-            {{- end }}
-            {{- if .Values.email.domains }}
+{{- end }}
+{{- if .Values.email.defaultSender }}
+    SMTP_FROM: {{ .Values.email.defaultSender }}
+{{- end }}
+{{- if .Values.email.defaultSenderName }}
+    SMTP_FROM_NAME: {{ .Values.email.defaultSenderName }}
+{{- end }}
+{{- if .Values.email.forceSender }}
+    SMTP_FORCE_FROM: {{ .Values.email.forceSender }}
+{{- end }}
+{{- if .Values.email.domains }}
    SMTP_ALLOWONLY_DOMAINS: {{ .Values.email.domains | join "," }}
-            {{- end }}
-            {{- if .Values.email.allowedEmails }}
+{{- end }}
+{{- if .Values.email.allowedEmails }}
    SMTP_ALLOWONLY_EMAILS: {{ .Values.email.allowedEmails | join "," }}
-            {{- end }}
-        {{- else }}
-    SMTP_FORCE_FROM: "customer-noreply@v3.nu"
-    SMTP_FROM_NAME: "V3 Customer Mailer"
-        {{- end }}
-    WP_ENV: "{{ .Values.site.environment | default "production" }}"
-    WP_HOME: "https://{{ ( .Values.site.redirectDomain | default ( .Values.site.domain )) | replace "https://" "" | replace "http://" "" }}"
-    {{- if .Values.site.additionalEnv }}
-        {{- range $k, $v := .Values.site.additionalEnv }}
+{{- end }}
+    WP_HOME: "https://{{ .Values.site.domain | replace "http://" "" | replace "https://" "" }}"
+    
+{{- if .Values.site.additionalEnv }}
+  {{- range $k, $v := .Values.site.additionalEnv }}
    {{ $k }}: {{ $v }}
-        {{- end }}
-    {{- end }}
+  {{- end }}
+{{- end }}
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -49,13 +60,17 @@ data:
            "webserverGroup": "unit",
            "applicationDir": "/app",
            "permissions": "0770",
-            "updatePermissions": true,
-            "importDatabase": {{ .Values.database.import | default false }},
-            "databasePath": "{{ .Values.database.importPath | default "" }}",
-            "overwriteDatabase": {{ .Values.database.overwrite | default false }},
+            "updatePermissions": {{ .Values.init.wp.updatePermissions | default false }},
+            "importDatabase": {{ .Values.init.db.active | default false }},
+            "databasePath": "{{ .Values.init.db.path | default "" }}",
+            "databaseUrl": "{{ .Values.init.db.url | default "" }}",
+            "importContent": {{ .Values.init.content.active | default false }},
+            "contentPath": "{{ .Values.init.content.path | default "" }}",
+            "contentUrl": "{{ .Values.init.content.url | default "" }}",
+            "overwriteDatabase": {{ .Values.init.db.overwrite | default false }},
            "generateSalts": true,
-            "activateTheme": "{{ .Values.site.theme | default .Values.site.name }}",
-            "convertUploadsToWebp": {{ .Values.site.enableWebpConversion | default false }},
+            "activateTheme": "{{ .Values.init.wp.theme | default .Values.site.name }}",
+            "convertUploadsToWebp": {{ .Values.init.content.webpConverter | default false }},
            "convertMissingOnly": true
        }

@@ -133,7 +148,7 @@ data:
                        ]
                    }
                },
-                {{- if eq .Values.site.enableWebpRoute "true" }}
+                {{- if  (.Values.site.webpRoute | default "true")  }}
                {
                    "match": {
                        "uri": [
@@ -175,25 +190,30 @@ data:
                    },
                    "options": {
                        "user": {
-                            "display_errors": "{{ .Values.site.displayErrors | default "0" }}",
-                            "log_errors": "{{ .Values.site.logErrors | default "1" }}"
+                                {{- if and .Values.php .Values.php.additionalValues }}
+                                    {{- range $k, $v := .Values.php.additionalValues }}
+                            "{{ $k }}": "{{ $v }}",
+                                    {{- end }}
+                                {{- end }}
+                            "display_errors": "{{ .Values.php.displayErrors | default "Off" }}",
+                            "log_errors": "{{ .Values.php.logErrors | default "On" }}"
                        },
                        "admin": {
                            "expose_php": "Off",
                            "short_open_tag": "Off",
                            "disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source",
-                            "log_errors": "On",                            
-                            {{- if and .Values.advanced .Values.advanced.php .Values.advanced.php.additionalAdminValues }}
-                            {{- range $k, $v := .Values.advanced.php.additionalAdminValues }}
-                                "{{ $k }}": "{{ $v }}",
-                            {{- end }}
-                            {{- else }}
-                                "memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}",
-                                "upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}",
-                                "post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}",
-                                "max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}",
-                                "max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}",
-                            {{- end }}
+                            "log_errors": "{{ .Values.php.logErrors | default "On" }}",                            
+                                {{- if and .Values.php .Values.php.additionalAdminValues }}
+                                    {{- range $k, $v := .Values.php.additionalAdminValues }}
+                            "{{ $k }}": "{{ $v }}",
+                                    {{- end }}
+                                {{- else }}
+                            "memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}",
+                            "upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}",
+                            "post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}",
+                            "max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}",
+                            "max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}",
+                                {{- end }}
                            "date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}"
                        }
                    },
@@ -209,3 +229,20 @@ data:
                }
            }
        }
+{{- if .Values.storage.configMap }}
+    {{- range .Values.storage.configMap }}
+        {{- if eq .type "configmap" }}
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+    name: {{ include "..fullname" $ }}-cm-{{ .name }}
+    labels:
+        {{- include "..labels" $ | nindent 8 }}
+data:
+            {{- range $k, $v := .files }}
+    {{ $v.name }}: {{ $v.content | toYaml | indent 4}}
+            {{- end }}
+        {{- end }}
+    {{- end }}
+{{- end }}
--- a/Chart/templates/database.yaml
+++ b/Chart/templates/database.yaml
@@ -6,7 +6,7 @@ metadata:
        {{- include "..labels" . | nindent 8 }}
 spec:
    secretName: {{ include "..fullname" . }}-db-auth
-    instance: {{ .Values.database.server | default "kincaid" }}
+    instance: {{ .Values.site.dbInstance | default "kincaid" }}
    deletionProtected: yes
    backup:
        enable: No
--- a/Chart/templates/deployment.yaml
+++ b/Chart/templates/deployment.yaml
@@ -13,119 +13,170 @@ spec:
  {{- end }}
  selector:
    matchLabels:
-      cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63  }}
-      cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
-      cloudyne.systems/site: {{ .Values.site.domain }}
+      {{- include "..selector-labels" . | nindent 6 }}
  template:
    metadata:
      labels:
-        cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63  }}
-        cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
-        cloudyne.systems/site: {{ .Values.site.domain }}
+        {{- include "..selector-labels" . | nindent 8 }}
    spec:
      securityContext:
        fsGroup: 101
      volumes:
-        - name: cloud
-          persistentVolumeClaim:
-            claimName: pvc-{{ include "..fullname" . }}
-        - name: cloud-local
-          persistentVolumeClaim:
-            claimName: pvc-{{ include "..fullname" . }}-local
        - name: serverconfig
          configMap:
            name: {{ include "..fullname" . }}-cfg
+      {{- if and .Values.secrets .Values.secrets.external }}
+        {{- range .Values.secrets.external }}
+          {{- if eq .type "file" }}
+        - name: {{ .name }}
+          secret:
+            secretName: {{- include "..fullname" $ }}-exts-{{ .name }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.storage.kubernetes }}
+        {{- range .Values.storage.kubernetes }}
+        - name: {{ .name }}
+        {{- if eq .type "secret" }}
+          secret:
+            secretName: "{{- include "..fullname" $ }}-sec-{{ .name }}"
+        {{- end }}
+        {{- if eq .type "configmap" }}
+          configMap:
+            name: "{{- include "..fullname" $ }}-sec-{{ .name }}"
+        {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.storage.cloud.active }}
+        - name: cloud
+          persistentVolumeClaim:
+            claimName: pvc-{{- include "..name" . }}-cloud
+      {{- end }}
+      {{- if .Values.storage.local.active }}
+        - name: local
+          persistentVolumeClaim:
+            claimName: pvc-{{- include "..name" . }}-local
+      {{- end }}
+      {{- if and .Values.secrets .Values.secrets.external }}
+        {{- range .Values.secrets.external }}
+          {{- if eq .type "docker" }}
      imagePullSecrets:
-        - name: pull-secret
+        - name: "{{- include "..fullname" $ }}-exts-{{ .name }}"
+          {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if .Values.storage.kubernetes }}
+        {{- range .Values.storage.kubernetes }}
+          {{- if eq .type "docker" }}
+      imagePullSecrets:
+        - name: "{{- include "..fullname" $ }}-sec-{{ .name }}"
+          {{- end }}
+        {{- end }}
+      {{- end }}
      initContainers:
-        - name: init-storage
+      {{- if and .Values.storage.cloud.active .Values.storage.local.active }}
+        - name: init-local-storage
          securityContext:
            allowPrivilegeEscalation: false
            runAsUser: 0
          image: cloudyne/ubuntu-ci:latest
          command: ["python3"]
-          args: ["/usr/local/bin/storage-clone", "/full-cloud", "/full-cloud-local"]
+          args: ["/usr/local/bin/storage-clone", "/mnt/cloud", "/mnt/local"]
          imagePullPolicy: Always
          volumeMounts:
            - name: cloud
-              mountPath: /full-cloud
-            - name: cloud-local
-              mountPath: /full-cloud-local
-        - name: deploy
+              mountPath: /mnt/cloud
+            - name: local
+              mountPath: /mnt/local
+      {{- end }}
+        - name: init-site
          securityContext:
            allowPrivilegeEscalation: false
            runAsUser: 0
-          image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}"
+          image: "{{ .Values.site.image }}"
          imagePullPolicy: Always
          volumeMounts:
-            - name: cloud
-              mountPath: /full-cloud
            - name: serverconfig
              mountPath: /init-go/config.json
              subPath: init.json
-          {{- if .Values.storage.wpContent }}
-            {{- range $v := .Values.storage.wpContent }}
-            - name: cloud-local
-              mountPath: "/app/web/app/{{ $v }}"
-              subPath: "{{ $v }}"
+            {{- if .Values.storage.local.active }}
+            {{- range .Values.storage.folders }}
+            - name: local
+              mountPath: "/app/web/app/{{ . }}"
+              subPath: "{{ . }}"
            {{- end }}
-          {{- end }}
-          {{- if .Values.storage.additionalMounts }}
-            {{- range $v := .Values.storage.additionalMounts }}
-            - name: cloud-local
-              mountPath: {{ $v.localPath }}
-              subPath: {{ $v.cloudPath }}
+            {{- if .Values.storage.cloud.active }}
+            - name: cloud
+              mountPath: "/mnt/cloud"
+            {{- end }}
+            {{- else }}
+              {{- if .Values.storage.cloud.active }}
+                {{- range .Values.storage.folders }}
+            - name: cloud
+              mountPath: "/app/web/app/{{ . }}"
+              subPath: "{{ . }}"
+                {{- end }}
+              {{- end }}
            {{- end }}
-          {{- end }}
          envFrom:
            - configMapRef:
                name: {{ include "..fullname" . }}-env
+            {{- if and .Values.secrets .Values.secrets.external }}
+              {{- range .Values.secrets.external }}
+                {{- if eq .type "env" }}
+            - secretRef:
+                name: "{{- include "..fullname" $ }}-exts-{{ .name }}" 
+                {{- end }}
+              {{- end }}
+            {{- end }}
            - secretRef:
                name: {{ include "..fullname" . }}-db-auth
-            - secretRef:
-                name: global-secrets
-          {{- if eq (.Values.site.container_base | default "debian" ) "debian" }}
-          command: [ "/init-go/init-go" ]
-          {{- else }}
          command: ["sh"]
          args: ["-c", "/init-go/init-go"]
-          {{- end }}
      containers:
        - name: wordpress
          securityContext:
            runAsUser: 101
-          image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}"
+          image: "{{ .Values.site.image }}"
          imagePullPolicy: Always
          volumeMounts:
            - name: serverconfig
-              mountPath: /docker-entrypoint.d/unit.json
-              subPath: unit.json
+              mountPath: /init-go/config.json
+              subPath: init.json
+            {{- if .Values.storage.local.active }}
+            {{- range .Values.storage.folders }}
+            - name: local
+              mountPath: "/app/web/app/{{ . }}"
+              subPath: "{{ . }}"
+            {{- end }}
+            {{- if .Values.storage.cloud.active }}
            - name: cloud
-              mountPath: /var/cloud
-          {{- if .Values.storage.wpContent }}
-            {{- range $v := .Values.storage.wpContent }}
-            - name: cloud-local
-              mountPath: "/app/web/app/{{ $v }}"
-              subPath: "{{ $v }}"
+              mountPath: "/mnt/cloud"
            {{- end }}
-          {{- end }}
-          {{- if .Values.storage.additionalMounts }}
-            {{- range $v := .Values.storage.additionalMounts }}
-            - name: cloud-local
-              mountPath: {{ $v.localPath }}
-              subPath: {{ $v.cloudPath }}
+            {{- else }}
+              {{- if .Values.storage.cloud.active }}
+                {{- range .Values.storage.folders }}
+            - name: cloud
+              mountPath: "/app/web/app/{{ . }}"
+              subPath: "{{ . }}"
+                {{- end }}
+              {{- end }}
            {{- end }}
-          {{- end }}
+          {{- include "..resourcelimits" . | nindent 10 }}
          envFrom:
            - configMapRef:
                name: {{ include "..fullname" . }}-env
+            {{- if and .Values.secrets .Values.secrets.external }}
+              {{- range .Values.secrets.external }}
+                {{- if eq .type "env" }}
+            - secretRef:
+                name: "{{- include "..fullname" $ }}-exts-{{ .name }}" 
+                {{- end }}
+              {{- end }}
+            {{- end }}
            - secretRef:
                name: {{ include "..fullname" . }}-db-auth
-            - secretRef:
-                name: global-secrets
-          {{- include "..resourcelimits" . | nindent 10 }}
          ports:
            - containerPort: 8080
              name: http
-              protocol: TCP
-            
+              protocol: TCP
--- a/Chart/templates/externalsecret.yaml
+++ b/Chart/templates/externalsecret.yaml
@@ -1,72 +1,34 @@
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-    name: {{ include "..fullname" . }}-ex-gl-secret
-    labels:
-        {{- include "..labels" . | nindent 8 }}
-spec:
-  refreshInterval: 4h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: az-cluster-store
-  target:
-    name: global-secrets
-    creationPolicy: Orphan
-    template:
-      metadata:
-        labels:
-          app.kubernetes.io/managed-by: External-Secrets
-  data:
-    - secretKey: COMPOSER_AUTH
-      remoteRef:
-        key: secret/GITLAB-COMPOSER-AUTH
-    {{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
-    - secretKey: SMTP_USER
-      remoteRef:
-        key: secret/SMTP-USER
-    - secretKey: SMTP_PASS
-      remoteRef:
-        key: secret/SMTP-PASSWORD
-    - secretKey: SMTP_HOST
-      remoteRef:
-        key: secret/SMTP-HOST
-    {{- else }}
-    - secretKey: SMTP_USER
-      remoteRef:
-        key: secret/AWS-SMTP-USER
-    - secretKey: SMTP_PASS
-      remoteRef:
-        key: secret/AWS-SMTP-PASSWORD
-    - secretKey: SMTP_HOST
-      remoteRef:
-        key: secret/AWS-SMTP-HOST
-    {{- end }}
-    - secretKey: WPC_REGISTRATION_SECRET
-      remoteRef:
-        key: secret/WPC-REGISTRATION-SECRET
+{{- if and .Values.secrets .Values.secrets.external }}
+  {{- range .Values.secrets.external }}
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: {{ include "..fullname" . }}-ex-pull-secret
+  name: {{ include "..fullname" $ }}-ext-{{ .name }}
  labels:
-    {{- include "..labels" . | nindent 8 }}
+    {{- include "..labels" $ | nindent 8 }}
 spec:
-  refreshInterval: 4h
+  refreshInterval: {{ .refreshInterval | default "10h" }}
  secretStoreRef:
+    {{- if .ref.clusterSecretStore }}
    kind: ClusterSecretStore
-    name: az-cluster-store
+    name: {{ .ref.clusterSecretStore }}
+    {{- else }}
+    kind: SecretStore
+    name: {{ .ref.secretStore }}
+    namespace: {{ .ref.secretStoreNamespace }}
+    {{- end }}
  target:
-    name: pull-secret
+    name: {{ include "..fullname" $ }}-exts-{{ .name }}
    template:
      metadata:
        labels:
          app.kubernetes.io/managed-by: External-Secrets
-      type: kubernetes.io/dockerconfigjson
-      data:
-        .dockerconfigjson: "{{`{{ .dockerconfig | toString }}`}}"
-    creationPolicy: Orphan
-  data:
-    - secretKey: dockerconfig
-      remoteRef:
-        key: secret/CLDY-CR-PULL-TOKEN
+    data:
+      {{- range $v := .items }}
+      - secretKey: {{ $v.target }}
+        remoteRef:
+          key: {{ $v.source }}
+      {{- end }}
+  {{- end }}
+{{- end }}
--- a/Chart/templates/ingress.yaml
+++ b/Chart/templates/ingress.yaml
@@ -11,70 +11,18 @@ spec:
  ingressClassName: nginx
  tls:
    - secretName: {{ include "..fullname" . }}-cert-secret
-      hosts:
-        - {{ .Values.site.domain | replace "www." "" }}
-        - www.{{ .Values.site.domain | replace "www." "" }}
-        - {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-        - www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-{{- if .Values.site.additionalIngressDomains  }}
-    {{- range .Values.site.additionalIngressDomains }}
-        - {{ . }}
-    {{- end }}
-{{- end }}
-      
+      hosts: {{ include "..domains" . | nindent 8 }}
+              
  rules:
-    - host: {{ .Values.site.domain | replace "www." "" }}
+    {{- range include "..domains" . | split "\n" }}
+    - host: {{ . | replace "- " ""}}
      http:
        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80            
-    - host: www.{{ .Values.site.domain | replace "www." "" }}
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80
-    - host: {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80
-
-    - host: www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" . }}
-              port:
-                number: 80  
-      {{- if .Values.site.additionalIngressDomains  }}
-        {{- range .Values.site.additionalIngressDomains }}
-    - host: {{ . }}
-      http:
-        paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: {{ include "..fullname" $ }}
-              port:
-                number: 80
-        {{- end }}
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "..fullname" $ }}
+                port:
+                  number: 80
    {{- end }}
--- a/Chart/templates/persistentvolume.yaml
+++ b/Chart/templates/persistentvolume.yaml
@@ -1,37 +1,39 @@
+{{ if .Values.storage.cloud.active }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-    name: pv-{{ include "..fullname" . }}
-    labels:
-        {{- include "..labels" . | nindent 8 }}
+  name: pv-{{ include "..name" . }}-cloud
+  labels:
+    {{- include "..labels" . | nindent 4 }}
 spec:
-    accessModes:
-        - ReadWriteOnce
-    capacity:
-        storage: {{ .Values.site.resources.disk | default "5Gi" }}
-    csi:
-        driver: blob.csi.azure.com
-        nodeStageSecretRef:
-            name: cloudyne{{ .Values.storage.class | default "premium01" }}-credentials
-            namespace: blob-csi
-        volumeAttributes:
-            containername: {{ .Values.storage.container | default ( .Values.site.domain | replace "." "-") }}
-            csi.storage.k8s.io/pv/name: pv-{{ include "..fullname" . }}
-            csi.storage.k8s.io/pvc/namespace: {{ include "..fullname" . }}
-            secretnamespace: {{ include "..fullname" . }}
-            skuName: {{ .Values.storage.type | default "Premium_LRS"  }}
-        volumeHandle: {{ .Values.storage.class | default "premium01"  }}-retain_{{ include "..fullname" . }}
-    mountOptions:
-        - -o allow_other
-        - --file-cache-timeout-in-seconds=120
-        - --use-attr-cache=true
-        - --cancel-list-on-mount-seconds=10
-        - -o attr_timeout=120
-        - -o entry_timeout=120
-        - -o negative_timeout=120
-        - --log-level=LOG_WARNING
-        - --cache-size-mb=3500
-        - -o uid=101
-    persistentVolumeReclaimPolicy: Retain
-    storageClassName: {{ .Values.storage.class | default "premium01" }}-retain
-    volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  capacity:
+    storage: {{ .Values.site.resources.disk }}
+  csi:
+    driver: {{ .Values.storage.cloud.driver | default "blob.csi.azure.com" }}
+    nodeStageSecretRef:
+      name: {{ .Values.storage.cloud.account }}-credentials
+      namespace: blob-csi
+    volumeAttributes:
+      containername: {{ .Values.storage.cloud.container }}
+      csi.storage.k8s.io/pv/name: pv-{{ include "..name" . }}-cloud
+      csi.storage.k8s.io/pvc/namespace: {{ .Release.Namespace }}
+      secretnamespace: {{ .Release.Namespace }}
+      skuName: {{ .Values.storage.cloud.sku | default "Premium_LRS" }}
+    volumeHandle: {{ .Values.storage.cloud.class }}_{{ include "..fullname" . }}
+  mountOptions:
+    - -o allow_other
+    - --file-cache-timeout-in-seconds=120
+    - --use-attr-cache=true
+    - --cancel-list-on-mount-seconds=10
+    - -o attr_timeout=120
+    - -o entry_timeout=120
+    - -o negative_timeout=120
+    - --log-level=LOG_WARNING
+    - --cache-size-mb=3500
+    - -o uid=101
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: {{ .Values.storage.cloud.class }}
+  volumeMode: Filesystem
+{{- end }}
--- a/Chart/templates/persistentvolumeclaim.yaml
+++ b/Chart/templates/persistentvolumeclaim.yaml
@@ -1,37 +1,36 @@
---
+{{- if .Values.storage.cloud.active }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-    annotations:
-        volume.beta.kubernetes.io/storage-provisioner: blob.csi.azure.com
-        volume.kubernetes.io/storage-provisioner: blob.csi.azure.com
-    labels:
-        {{- include "..labels" . | nindent 8 }}
-    name: pvc-{{ include "..fullname" . }}
+  name: pvc-{{ include "..name" . }}-cloud
+  labels:
+    {{- include "..labels" . | nindent 4 }}
+  annotations:
+    volume.beta.kubernetes.io/storage-class: {{ .Values.storage.cloud.driver }}
+    volume.kubernetes.io/storage-class: {{ .Values.storage.cloud.driver }}
 spec:
-    volumeMode: Filesystem
-    volumeName: pv-{{ include "..fullname" . }}
-    accessModes:
-        - ReadWriteOnce
-    resources:
-        requests:
-            storage: {{ .Values.site.resources.disk | default "5Gi" }}
-
-{{- if and .Values.storage .Values.storage.class }}
-    storageClassName: {{ .Values.storage.class | default "premium01" }}-retain
+  volumeMode: Filesystem
+  volumeName: pv-{{ include "..name" . }}-cloud
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.site.resources.disk }}
+  storageClassName: {{ .Values.storage.cloud.class }}
 {{- end }}
---
+{{- if .Values.storage.local.active }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-    labels:
-        {{- include "..labels" . | nindent 8 }}
-    name: pvc-{{ include "..fullname" . }}-local
+  name: pvc-{{ include "..name" . }}-local
+  labels:
+    {{- include "..labels" . | nindent 4 }}
 spec:
-    volumeMode: Filesystem
-    accessModes:
-        - ReadWriteOnce
-    resources:
-        requests:
-            storage: {{ .Values.site.resources.disk | default "5Gi" }}
-    storageClassName: "longhorn"
+  volumeMode: Filesystem
+  accessModes: 
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.site.resources.disk }}
+  storageClassName: {{ .Values.storage.local.class }}
+{{- end }}
--- a/Chart/templates/secret.yaml
+++ b/Chart/templates/secret.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.storage.kubernetes }}
+    {{- range .Values.storage.kubernetes }}
+        {{- if eq .type "secret" }}
+---
+kind: Secret
+apiVersion: v1
+metadata:
+    name: {{ include "..fullname" $ }}-sec-{{ .name }}
+    labels:
+        {{- include "..labels" $ | nindent 8 }}
+stringData:
+            {{- range $k, $v := .files }}
+    {{ $v.name }}: {{ $v.content | toYaml | indent 4}}
+            {{- end }}
+        {{- end }}
+    {{- end }}
+{{- end }}
--- a/Chart/templates/service.yaml
+++ b/Chart/templates/service.yaml
@@ -10,7 +10,5 @@ spec:
      port: 80
      targetPort: 8080
  selector:
-    cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63  }}
-    cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
-    cloudyne.systems/site: {{ .Values.site.domain }}
+    {{- include "..selector-labels" . | nindent 4 }}
  type: ClusterIP