Update .gitlab-ci.yml

Unit

See merge request helm/wordpress-hosting!1

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.8.12"
+  HELM_CHART_VERSION: "0.0.3"
 
 stages:
   - deploy

Chart/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: cloudypress
 description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit
 type: application
-version: "0.8.12"
-appVersion: "6.2.2"
+version: "0.0.2"
+appVersion: "6.2.0"

Chart/templates/configmap.yaml

@@ -28,12 +28,7 @@ data:
     SMTP_FROM_NAME: "V3 Customer Mailer"
     {{- end }}
     
-    {{- if and .Values.site .Values.site.overrideEnvironment }}
-    WP_ENV: "{{ .Values.site.overrideEnvironment }}"
-    {{- else  }}
-    WP_ENV: "production"
-    {{- end }}
-
+    WP_ENV: "{{ .Values.site.env | default "production" }}"
     {{- if .Values.site.overrideMainUrl }}
     WP_HOME: "https://{{ .Values.site.overrideMainUrl }}"
     {{- else }}
@@ -134,28 +129,6 @@ data:
                         ]
                     }
                 },
-                {{- if eq .Values.site.enableWebpRoute "true" }}
-                {
-                    "match": {
-                        "uri": [
-                            "*.jpg",
-                            "*.jpeg",
-                            "*.gif",
-                            "*.png"
-                        ]
-                    },
-                    "action": {
-                        "share": [
-                            "/app/web$uri.webp",
-                            "/app/web$uri"
-                        ],
-                        "fallback": {
-                            "pass": "applications/php/index"
-                        }
-
-                    }
-                },
-                {{- end }}
                 {
                     "action": {
                         "share": "/app/web$uri",

Chart/templates/externalsecret.yaml

@@ -2,6 +2,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
     name: global-secrets-ext
+    namespace: {{ include "..fullname" . }}
     labels:
         {{- include "..labels" . | nindent 8 }}
 spec:

Chart/templates/persistentvolume.yaml

@@ -35,4 +35,4 @@ spec:
     persistentVolumeReclaimPolicy: Retain
     storageClassName: {{ .Values.site.storage.cloud.class }}-retain
     volumeMode: Filesystem
----
+---

Chart/templates/persistentvolumeclaim.yaml

@@ -19,4 +19,4 @@ spec:
 
 {{- if and .Values.site .Values.site.storage .Values.site.storage.cloud }}
     storageClassName: {{ .Values.site.storage.cloud.class }}-retain
-{{- end }}
+{{- end }}

Chart/values.yaml

@@ -37,6 +37,8 @@ email: {}
 
 # Website Configuration
 site:
+  env: "development"
+
   # The main URL for the website
   url: "www.mycustomer.com"
 
@@ -44,15 +46,9 @@ site:
   additional_env: {}
   #  MY_ENV_VAR: "value"
 
-  # Whether to enable the webp route
-  # enableWebpRoute: "false"
-
-  # Override the environment. Valid values are production, staging and development
-  # overrideEnvironment: "staging"
-
   # Create sites with another main domain for WP, 
   # but the rest of the components named according to site-tld 
-  # overrideMainUrl: ""
+  overrideMainUrl: ""
 
   # Whether to keep plugins and Wordpress updated
   autoUpdate: 'true'