Created version 0.5

Chart/templates/deployment.yaml

@@ -6,29 +6,29 @@ metadata:
     {{- include "..labels" . | nindent 4 }}
     cloudyne.systems/component: site
 spec:
-{{- if and .Values.customer .Values.customer.package }}
-  replicas: {{ .Values.customer.package.replicas | default 1 }}
-{{- else }}
+  {{- if .Values.site.resources }}
+  replicas: {{ .Values.site.resources.replicas | default 1 }}
+  {{- else }}
   replicas: 1
-{{- end }}
+  {{- end }}
   selector:
     matchLabels:
-      cloudyne.systems/customer: {{ .Values.customer.name }}
-      cloudyne.systems/site: {{ .Values.site.url }}
+      cloudyne.systems/customer: {{ .Values.customer.legalName }}
+      cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
+      cloudyne.systems/site: {{ .Values.site.domain }}
   template:
     metadata:
       labels:
-        cloudyne.systems/customer: {{ .Values.customer.name }}
-        cloudyne.systems/site: {{ .Values.site.url }}
+        cloudyne.systems/customer: {{ .Values.customer.legalName }}
+        cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
+        cloudyne.systems/site: {{ .Values.site.domain }}
     spec:
       securityContext:
-        fsGroup: 65534
+        fsGroup: 101
       volumes:
         - name: cloud
           persistentVolumeClaim:
             claimName: pvc-{{ include "..fullname" . }}
-        - name: local
-          emptyDir: {}
         - name: serverconfig
           configMap:
             name: {{ include "..fullname" . }}-cfg
@@ -37,19 +37,22 @@ spec:
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 0
-        {{- if .Values.global }}
-          image: {{ .Values.global.initImage | default "ghcr.io/cloudynes/php-init" }}:{{ .Values.global.imagetag | default "latest" }}
-        {{- else }}
-          image: ghcr.io/cloudynes/php-init:latest
-        {{- end }}
+          image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}"
           imagePullPolicy: Always
+          imagePullSecrets:
+            - name: pull-secret
           volumeMounts:
-            - name: local
-              mountPath: /app
             - name: cloud
               mountPath: /full-cloud
-          {{- if and .Values.site .Values.site.storage .Values.site.storage.cloud .Values.site.storage.cloud.folders }}
-            {{- range $v := .Values.site.storage.cloud.folders }}
+          {{- if .Values.storage.wpContent }}
+            {{- range $v := .Values.storage.wpContent }}
+            - name: cloud
+              mountPath: "/app/web/app/{{ $v }}"
+              subPath: "{{ $v }}"
+            {{- end }}
+          {{- end }}
+          {{- if .Values.storage.additionalMounts }}
+            {{- range $v := .Values.storage.additionalMounts }}
             - name: cloud
               mountPath: {{ $v.localPath }}
               subPath: {{ $v.cloudPath }}
@@ -65,24 +68,22 @@ spec:
       containers:
         - name: wordpress
           securityContext:
-            runAsUser: 65534
-        {{- if .Values.global }}
-          image: {{ .Values.global.serverImage | default "ghcr.io/cloudynes/php-nginx" }}:{{ .Values.global.imagetag | default "latest" }}
-        {{- else }}
-          image: ghcr.io/cloudynes/php-nginx:latest
-        {{- end }}
+            runAsUser: 101
+          image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}"
           imagePullPolicy: Always
           volumeMounts:
-            - name: local
-              mountPath: /app
             - name: serverconfig
-              mountPath: /etc/nginx/nginx.conf
-              subPath: nginx.conf
-            - name: serverconfig
-              mountPath: /usr/local/etc/php-fpm.d/www.conf
-              subPath: www.conf
-          {{- if and .Values.site .Values.site.storage .Values.site.storage.cloud .Values.site.storage.cloud.folders }}
-            {{- range $v := .Values.site.storage.cloud.folders }}
+              mountPath: /docker-entrypoint.d/unit.json
+              subPath: unit.json
+          {{- if .Values.storage.wpContent }}
+            {{- range $v := .Values.storage.wpContent }}
+            - name: cloud
+              mountPath: "/app/web/app/{{ $v }}"
+              subPath: "{{ $v }}"
+            {{- end }}
+          {{- end }}
+          {{- if .Values.storage.additionalMounts }}
+            {{- range $v := .Values.storage.additionalMounts }}
             - name: cloud
               mountPath: {{ $v.localPath }}
               subPath: {{ $v.cloudPath }}
@@ -95,22 +96,7 @@ spec:
                 name: {{ include "..fullname" . }}-db-auth
             - secretRef:
                 name: global-secrets
-          resources:
-        {{- if and .Values.customer .Values.customer.package .Values.customer.package.cpu }}
-            requests:
-                cpu: {{ .Values.customer.package.cpu.avg | default "1000m" }}
-                memory: {{ .Values.customer.package.mem.avg | default "1Gi" }}
-            limits:
-                cpu: {{ .Values.customer.package.cpu.peak | default "1000m" }}
-                memory: {{ .Values.customer.package.mem.peak | default "1Gi" }}
-        {{- else }}
-            requests:
-                cpu: 1000m
-                memory: 1Gi
-            limits:
-                cpu: 1000m
-                memory: 1Gi
-        {{- end }}
+          {{- include "..resourcelimits" . | nindent 10 }}
           ports:
             - containerPort: 8080
               name: http