fixex

alchemy-fr · Oct 16, 2023 · f24ddba · f24ddba
1 parent 484137b
commit f24ddba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/charts/phrasea/Chart.yaml b/charts/phrasea/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.6.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/phrasea/templates/api-php-deployment.yml b/charts/phrasea/templates/api-php-deployment.yml
@@ -52,12 +52,14 @@ spec:
             name: {{ .adminOAuthClient.externalSecretName | default (printf "%s-admin-oauth-client-secret" $appName) }}
         - configMapRef:
             name: {{ $appName }}-api-config
-        {{- if and .matomo .matomo.enabled }}
+        {{- if .matomo }}
+        {{- if .matomo.enabled }}
         - configMapRef:
             name: matomo
         - secretRef:
             name: matomo
         {{- end }}
+        {{- end }}
 ---
 {{- end }}
 {{- end }}

diff --git a/charts/phrasea/templates/matomo/matomo-configmap.yaml b/charts/phrasea/templates/matomo/matomo-configmap.yaml
@@ -3,10 +3,10 @@
 {{- if .matomo.enabled }}
 {{- with .matomo }}
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: matomo
-stringData:
+data:
   MATOMO_BASE_URL: {{ .baseUrl | quote }}
   MATOMO_SITE_ID: {{ .siteId | quote }}
 {{- end }}

diff --git a/charts/phrasea/templates/worker-deployment.yml b/charts/phrasea/templates/worker-deployment.yml
@@ -44,12 +44,14 @@ spec:
             name: {{ .adminOAuthClient.externalSecretName | default (printf "%s-admin-oauth-client-secret" $appName) }}
         - configMapRef:
             name: {{ $appName }}-api-config
-        {{- if and .matomo .matomo.enabled }}
+        {{- if .matomo }}
+        {{- if .matomo.enabled }}
         - configMapRef:
             name: matomo
         - secretRef:
             name: matomo
         {{- end }}
+        {{- end }}
 ---
 {{- end }}
 {{- end }}