chore: clean up those long vars

chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml

@@ -44,19 +44,23 @@ spec:
     monitoring:
       enabled: {{ .Values.monitoring.enabled }}
       namespace: monitoring
+    {{- with .Values.addons.mattermost.sso }}
     sso:
-      enabled: {{ .Values.addons.mattermost.sso.enabled }}
-      client_id: {{ .Values.addons.mattermost.sso.client_id }}
-      client_secret: {{ .Values.addons.mattermost.sso.client_secret }}
-      auth_endpoint: {{ .Values.addons.mattermost.sso.auth_endpoint }}
-      token_endpoint: {{ .Values.addons.mattermost.sso.token_endpoint }}
-      user_api_endpoint: {{ .Values.addons.mattermost.sso.user_api_endpoint }}
+      enabled: {{ .enabled }}
+      client_id: {{ .client_id }}
+      client_secret: {{ .client_secret }}
+      auth_endpoint: {{ .auth_endpoint }}
+      token_endpoint: {{ .token_endpoint }}
+      user_api_endpoint: {{ .user_api_endpoint }}
+    {{- end }}
     global:
       imagePullSecrets:
         - name: private-registry
+    {{- with .Values.addons.mattermost.enterprise }}
     enterprise:
-      enabled: {{ .Values.addons.mattermost.enterprise.enabled }}
-      license: {{ .Values.addons.mattermost.enterprise.license }}
+      enabled: {{ .enabled }}
+      license: {{ .license }}
+    {{- end }}
     {{- with .Values.addons.mattermost.database }}
     {{- if and .username .password .host .port .database .ssl_mode }}
     database: