Resolve "Mattermost packages: Update to meet standards"

chart/templates/NOTES.txt

@@ -185,4 +185,8 @@ DEPRECATION NOTICE:
   Please reconfigure your values overrides to use .Values.addons.nexusRepositoryManager 
 {{- end }}
 
-
+{{- if .Values.addons.mattermostoperator }}
+DEPRECATION NOTICE:
+  .Values.addons.mattermostoperator has been deprecated and will be removed in a future Big Bang release.
+  Please reconfigure your values overrides to use .Values.addons.mattermostOperator 
+{{- end }}

chart/templates/mattermost/operator/gitrepository.yaml → chart/templates/mattermost-operator/gitrepository.yaml

-{{- if and (eq (include "checkGitRef" .Values.addons.mattermostoperator) "true") (not .Values.offline) (or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled) }}
+{{- $mmOpOldValues := default dict .Values.addons.mattermostoperator -}}
+{{- $mmOpValues := merge $mmOpOldValues .Values.addons.mattermostOperator -}}
+{{- if and (eq (include "checkGitRef" $mmOpValues) "true") (not .Values.offline) (or $mmOpValues.enabled .Values.addons.mattermost.enabled) }}
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: GitRepository
 metadata:
@@ -10,9 +12,9 @@ metadata:
     {{- include "commonLabels" . | nindent 4}}
 spec:
   interval: {{ .Values.flux.interval }}
-  url: {{ .Values.addons.mattermostoperator.git.repo }}
+  url: {{ $mmOpValues.git.repo }}
   ref:
-    {{- include "validRef" .Values.addons.mattermostoperator.git | nindent 4 }}
+    {{- include "validRef" $mmOpValues.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

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

-{{- $fluxSettingsMattermostOperator := merge .Values.addons.mattermostoperator.flux .Values.flux -}}
-{{- if or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled }}
+{{- $mmOpOldValues := default dict .Values.addons.mattermostoperator -}}
+{{- $mmOpValues := merge $mmOpOldValues .Values.addons.mattermostOperator -}}
+{{- $fluxSettingsMattermostOperator := merge $mmOpValues.flux .Values.flux -}}
+{{- if or $mmOpValues.enabled .Values.addons.mattermost.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -13,27 +15,27 @@ spec:
   targetNamespace: mattermost-operator
   chart:
     spec:
-      {{- if eq (include "checkGitRef" .Values.addons.mattermostoperator) "true" }}
-      chart: {{ .Values.addons.mattermostoperator.git.path }}
+      {{- if eq (include "checkGitRef" $mmOpValues) "true" }}
+      chart: {{ $mmOpValues.git.path }}
       sourceRef:
         kind: GitRepository
         name: mattermost-operator
         namespace: {{ .Release.Namespace }}
       {{- else }}
-      chart: {{ .Values.addons.mattermostoperator.oci.name }}
-      version: {{ .Values.addons.mattermostoperator.oci.tag }}
+      chart: {{ $mmOpValues.oci.name }}
+      version: {{ $mmOpValues.oci.tag }}
       sourceRef:
         kind: HelmRepository
-        name: {{ .Values.addons.mattermostoperator.oci.repo }}
+        name: {{ $mmOpValues.oci.repo }}
         namespace: {{ .Release.Namespace }}
       {{- end }}
       interval: 5m
 
   {{- toYaml $fluxSettingsMattermostOperator | nindent 2 }}
   
-  {{- if .Values.addons.mattermostoperator.postRenderers }}
+  {{- if $mmOpValues.postRenderers }}
   postRenderers:
-  {{- toYaml .Values.addons.mattermostoperator.postRenderers | nindent 4 }}
+  {{- toYaml $mmOpValues.postRenderers | nindent 4 }}
   {{- end }}
   valuesFrom:
     - name: {{ .Release.Name }}-mattermost-operator-values

chart/templates/mattermost/operator/imagepullsecret.yaml → chart/templates/mattermost-operator/imagepullsecret.yaml

-{{- if or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled }}
+{{- $mmOpOldValues := default dict .Values.addons.mattermostoperator -}}
+{{- $mmOpValues := merge $mmOpOldValues .Values.addons.mattermostOperator -}}
+{{- if or $mmOpValues.enabled .Values.addons.mattermost.enabled }}
 {{- if ( include "imagePullSecret" . ) }}
 apiVersion: v1
 kind: Secret

chart/templates/mattermost/operator/namespace.yaml → chart/templates/mattermost-operator/namespace.yaml

-{{- if or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled }}
+{{- $mmOpOldValues := default dict .Values.addons.mattermostoperator -}}
+{{- $mmOpValues := merge $mmOpOldValues .Values.addons.mattermostOperator -}}
+{{- if or $mmOpValues.enabled .Values.addons.mattermost.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:

chart/templates/mattermost/operator/values.yaml → chart/templates/mattermost-operator/values.yaml

-{{- if or .Values.addons.mattermostoperator.enabled .Values.addons.mattermost.enabled }}
-{{- include "values-secret" (dict "root" $ "package" .Values.addons.mattermostoperator "name" "mattermost-operator" "defaults" (include "bigbang.defaults.mattermostoperator" .)) }}
+{{- $mmOpOldValues := default dict .Values.addons.mattermostoperator -}}
+{{- $mmOpValues := merge $mmOpOldValues .Values.addons.mattermostOperator -}}
+{{- if or $mmOpValues.enabled .Values.addons.mattermost.enabled }}
+{{- include "values-secret" (dict "root" $ "package" $mmOpValues "name" "mattermost-operator" "defaults" (include "bigbang.defaults.mattermostOperator" .)) }}
 {{- end }}
 
-{{- define "bigbang.defaults.mattermostoperator" -}}
+{{- define "bigbang.defaults.mattermostOperator" -}}
 imagePullSecrets:
   - name: private-registry
 

chart/values.yaml

@@ -1254,7 +1254,7 @@ addons:
   # ----------------------------------------------------------------------------------------------------------------------
   # Mattermost Operator and Instance
   #
-  mattermostoperator:
+  mattermostOperator:
     enabled: false
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost-operator.git

chart/values2.0.yaml

@@ -200,7 +200,7 @@ addons:
       tag: "1.20.0-bb.1"
       repo: "registry1"
 
-  mattermostoperator:
+  mattermostOperator:
     git: null
     oci:
       name: "mattermost-operator"

docs/assets/configs/example/git-repo-values.yaml

@@ -160,7 +160,7 @@ addons:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
       path: "./chart"
       branch: "my-dev-branch"
-  mattermostoperator:
+  mattermostOperator:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost-operator.git
       path: "./chart"

docs/assets/scripts/airgap-dev/values.yaml

@@ -107,7 +107,7 @@ addons:
     enabled: false
     git:
       repo: ssh://git@host.k3d.internal/home/git/repos/haproxy
-  mattermostoperator:
+  mattermostOperator:
     enabled: false
     git:
       repo: ssh://git@host.k3d.internal/home/git/repos/mattermost-operator

docs/guides/using-bigbang/image-pull-policy.md

@@ -35,7 +35,7 @@ We have also documented the package overrides required if you want to set a sing
 | Nexus | `IfNotPresent` | <pre lang="yaml">addons:<br>  nexusRepositoryManager:<br>    values:<br>      image:<br>        pullPolicy: IfNotPresent<br>      job_image:<br>        pullPolicy: IfNotPresent</pre> |
 | Sonarqube | `IfNotPresent` | <pre lang="yaml">addons:<br>  sonarqube:<br>    values:<br>      image:<br>        pullPolicy: IfNotPresent</pre> |
 | Anchore | `IfNotPresent` | <pre lang="yaml">addons:<br>  anchore:<br>    values:<br>      anchoreGlobal:<br>        imagePullPolicy: IfNotPresent<br>      anchoreEnterpriseGlobal:<br>        imagePullPolicy: IfNotPresent<br>      anchoreEnterpriseUi:<br>        imagePullPolicy: IfNotPresent</pre> |
-| Mattermost Operator | `IfNotPresent` | <pre lang="yaml">addons:<br>  mattermostoperator:<br>    values:<br>      image:<br>        imagePullPolicy: IfNotPresent</pre> |
+| Mattermost Operator | `IfNotPresent` | <pre lang="yaml">addons:<br>  mattermostOperator:<br>    values:<br>      image:<br>        imagePullPolicy: IfNotPresent</pre> |
 | Mattermost | `IfNotPresent` | <pre lang="yaml">addons:<br>  mattermost:<br>    values:<br>      image:<br>        imagePullPolicy: IfNotPresent</pre> |
 | Velero | `IfNotPresent` | <pre lang="yaml">addons:<br>  velero:<br>    values:<br>      image:<br>        pullPolicy: IfNotPresent</pre> |
 | Keycloak | `IfNotPresent` | <pre lang="yaml">addons:<br>  keycloak:<br>    values:<br>      image:<br>        pullPolicy: IfNotPresent<br>      pgchecker:<br>        image:<br>          pullPolicy: IfNotPresent</pre> |

tests/test-values.yaml

@@ -1247,7 +1247,7 @@ addons:
             MINIO_PORT: ''
             MINIO_HOST: 'https://minio-api.bigbang.dev'
 
-  mattermostoperator:
+  mattermostOperator:
     enabled: false
 
   mattermost: