Merge branch...

Merge branch '2548-resolve-errors-from-enabling-drift-detection-for-mattermost-not-operator-2' into 'master'

Resolve "Resolve errors from enabling drift detection for Mattermost (not operator)"

Closes #2548 and big-bang/product/packages/mattermost#202

See merge request !5961

chart/templates/mattermost/helmrelease.yaml

@@ -16,6 +16,10 @@ spec:
   targetNamespace: mattermost
   driftDetection:
     mode: disabled
+    ignore:
+     - paths: ["/spec/size"]
+       target:
+         kind: Mattermost
   chart:
     spec:
       {{- if eq .Values.addons.mattermost.sourceType "git" }}

chart/values.yaml

@@ -1780,11 +1780,11 @@ addons:
     git:
       repo: https://repo1.dso.mil/big-bang/product/packages/mattermost.git
       path: "./chart"
-      tag: "10.5.1-bb.3"
+      tag: "10.6.1-bb.2"
     helmRepo:
       repoName: "registry1"
       chartName: "mattermost"
-      tag: "10.5.1-bb.3"
+      tag: "10.6.1-bb.2"
 
     # -- Flux reconciliation overrides specifically for the Mattermost Package
     flux: {}