Quoted bools, removed quota

.gitignore

@@ -1 +1,2 @@
-values.yaml
+example.yaml
+example*.yaml

chart/templates-old/NOTES.txt

@@ -1,22 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "..fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "..fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "..fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "..name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
-{{- end }}

chart/templates-old/_helpers.tpl

@@ -1,62 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "..name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "..fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "..chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "..labels" -}}
-helm.sh/chart: {{ include "..chart" . }}
-{{ include "..selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "..selectorLabels" -}}
-app.kubernetes.io/name: {{ include "..name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "..serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "..fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}

chart/templates-old/deployment.yaml

@@ -1,61 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "..fullname" . }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "..selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "..selectorLabels" . | nindent 8 }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "..serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

chart/templates-old/hpa.yaml

@@ -1,28 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "..fullname" . }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "..fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}

chart/templates-old/ingress.yaml

@@ -1,61 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "..fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
-  {{- end }}
-{{- end }}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- end }}
-  {{- if .Values.ingress.tls }}
-  tls:
-    {{- range .Values.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-{{- end }}

chart/templates-old/service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "..fullname" . }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    {{- include "..selectorLabels" . | nindent 4 }}

chart/templates-old/serviceaccount.yaml

@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "..serviceAccountName" . }}
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

chart/templates-old/tests/test-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "..fullname" . }}-test-connection"
-  labels:
-    {{- include "..labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "..fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never

chart/templates/NOTES.txt

@@ -0,0 +1,11 @@
+You have successfully installed your new website {{ .Values.site.url }}
+Ingress Domains:
+- {{ .Values.site.url | replace "www." "" }}
+- www.{{ .Values.site.url | replace "www." "" }}
+- {{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
+- www.{{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
+{{- if .Values.site.additionalIngressNames  }}
+{{- range .Values.site.additionalIngressNames }}
+- {{ . }}
+{{- end }}
+{{- end }}

chart/templates/configmap.yaml

@@ -5,29 +5,29 @@ metadata:
     labels:
         {{- include "..labels" . | nindent 8 }}
 data:
-    SMTP_PORT: 2525
+    SMTP_PORT: '2525'
-    SMTP_AUTH: "true"
+    SMTP_AUTH: 'true'
     SMTP_FORCE_FROM: "noreply@customer.v3.nu"
-    SMTP_FROM_NAME: "Gunnar Nilsson Maskin AB"
+    SMTP_FROM_NAME: "V3 Customer Mailer"
     WP_ENV: "production"
     WP_HOME: {{ .Values.site.url }}
     WP_SITEURL: {{ .Values.site.url }}/wp
 
     {{- if and .Values.site.init .Values.site.init.composerPackage }}
-    RUN_COMPOSER: "true"
+    RUN_COMPOSER: 'true'
     INSTALL_SITE: {{ .Values.site.init.composerPackage }}
     SET_THEME: {{ .Values.site.init.themeName | default "" }}
     {{- end }}
     
     {{- if and .Values.site.init  .Values.site.init.content .Values.site.init.content.import }}
-    RUN_IMPORTS: "true"
+    RUN_IMPORTS: 'true'
     IMPORT_CONTENT: {{ .Values.site.init.content.url }}
     {{- end }}
        
     {{- if and .Values.site.init  .Values.site.init.database .Values.site.init.database.import }}
-    RUN_DATABASEIMPORTS: "true"
+    RUN_DATABASEIMPORTS: 'true'
     IMPORT_DATABASE: {{ .Values.site.init.database.url }}
-    FORCE_IMPORT_DB: {{ .Values.site.init.database.force | default "false" }}
+    FORCE_IMPORT_DB: {{ .Values.site.init.database.force | default "false" | quote }}
     {{- end }}
 
 ---

chart/templates/database.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
     secretName: {{ include "..fullname" . }}-db-auth
     instance: {{ .Values.global.dbInstance | default "kincaid" }}
-    deletionProtected: true
+    deletionProtected: yes
     backup:
-        enable: false
+        enable: No
         cron: "0 0 * * *"
     secretsTemplates:
         PMA_HOST:{{` "{{ .DatabaseHost }}" `}}

chart/templates/deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "..fullname" . }}-cert
+  name: {{ include "..fullname" . }}
   labels:
     {{- include "..labels" . | nindent 4 }}
     cloudyne.systems/component: site
@@ -44,7 +44,7 @@ spec:
         {{- end }}
           imagePullPolicy: Always
           volumeMounts:
-            - name: site
+            - name: local
               mountPath: /app
           {{- if and .Values.site .Values.site.storage .Values.site.storage.cloud .Values.site.storage.cloud.folders }}
             {{- range $v := .Values.site.storage.cloud.folders }}
@@ -58,6 +58,8 @@ spec:
                 name: {{ include "..fullname" . }}-env
             - secretRef:
                 name: {{ include "..fullname" . }}-db-auth
+            - secretRef:
+                name: global-secrets-ext
       containers:
         - name: wordpress
           securityContext:
@@ -69,7 +71,7 @@ spec:
         {{- end }}
           imagePullPolicy: Always
           volumeMounts:
-            - name: site
+            - name: local
               mountPath: /app
             - name: serverconfig
               mountPath: /etx/nginx/nginx.conf
@@ -88,6 +90,8 @@ spec:
                 name: {{ include "..fullname" . }}-env
             - secretRef:
                 name: {{ include "..fullname" . }}-db-auth
+            - secretRef:
+                name: global-secrets-ext
           resources:
         {{- if and .Values.customer .Values.customer.package .Values.customer.package.cpu }}
             requests:

chart/templates/ingress.yaml

@@ -27,9 +27,9 @@ spec:
           pathType: Prefix
           backend:
             service:
-            name: {{ include "..fullname" . }}
+              name: {{ include "..fullname" . }}
-            port:
+              port:
-              number: 80            
+                number: 80            
     - host: www.{{ .Values.site.url | replace "www." "" }}
       http:
         paths:
@@ -37,9 +37,9 @@ spec:
           pathType: Prefix
           backend:
             service:
-            name: {{ include "..fullname" . }}
+              name: {{ include "..fullname" . }}
-            port:
+              port:
-              number: 80  
+                number: 80  
     - host: {{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
       http:
         paths:
@@ -47,9 +47,9 @@ spec:
           pathType: Prefix
           backend:
             service:
-            name: {{ include "..fullname" . }}
+              name: {{ include "..fullname" . }}
-            port:
+              port:
-              number: 80  
+                number: 80  
     - host: www.{{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
       http:
         paths:
@@ -57,9 +57,9 @@ spec:
           pathType: Prefix
           backend:
             service:
-            name: {{ include "..fullname" . }}
+              name: {{ include "..fullname" . }}
-            port:
+              port:
-              number: 80  
+                number: 80  
       {{- if .Values.site.additionalIngressNames  }}
       {{- range .Values.site.additionalIngressNames }}
     - host: {{ . }}
@@ -69,8 +69,8 @@ spec:
           pathType: Prefix
           backend:
             service:
-            name: {{ include "..fullname" . }}
+              name: {{ include "..fullname" . }}
-            port:
+              port:
-              number: 80  
+                number: 80  
       {{- end }}
       {{- end }}

chart/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-    name: {{ include "..fullname" . }}-cert
+    name: {{ include "..fullname" . }}
     labels:
         {{- include "..labels" . | nindent 8 }}
         cloudyne.systems/component: site

chart/values.yaml

@@ -28,7 +28,7 @@ site:
   url: "www.mycustomer.com"
 
   # Whether to keep plugins and Wordpress updated
-  autoUpdate: true
+  autoUpdate: 'true'
 
   # Storage settings
   storage: {}
@@ -58,14 +58,14 @@ site:
     content: {}
 
     # content:
-    #   import: true
+    #   import: 'true'
     #   url: "https://mycustomer.com/wp-content-data.zip"
     
     # Optional: Import database from URL
     database: {}
     
     # database:
-    #   import: true
+    #   import: 'true'
     #   force: false
     #   url: "https://www.mycustomer.com/mysqldump.sql"