Merge branch 'master' into 936-make-all-monitoring-optional

flux2/apps/rocketchat/release.yaml

@@ -9,10 +9,10 @@ spec:
   chart:
     spec:
       chart: rocketchat
-      version: 2.0.10
+      # NOTE: Change the GitRepository yaml file if you want a different version
       sourceRef:
-        kind: HelmRepository
-        name: helm-stable
+        kind: GitRepository
+        name: rocketchat-helm-chart
         namespace: flux-system
   interval: 1h
   install:

flux2/apps/rocketchat/rocketchat-values-configmap.yaml

@@ -106,8 +106,9 @@ data:
         memory: 768Mi
 
     mongodb:
-      mongodbRootPassword: ${mongodb_root_password}
-      mongodbPassword: ${mongodb_password}
+      auth:
+        rootPassword: ${mongodb_root_password}
+        password: ${mongodb_password}
       podAnnotations:
         # Let the backup system include rocketchat data stored in mongodb.
         backup.velero.io/backup-volumes: "datadir"

flux2/infrastructure/local-path-provisioner/local-path-provisioner-values-configmap.yaml

@@ -14,8 +14,12 @@ data:
     # We temporarily use our own build in order to use local volumes instead of
     # hostPath.
     image:
-      repository: "open.greenhost.net:4567/openappstack/openappstack/local-path-provisioner"
-      tag: "0.0.20-gh1"
+      # We need to use our own fork of the local-path-provisioner until
+      # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
+      repository: "open.greenhost.net:4567/openappstack/local-path-provisioner/local-path-provisioner"
+      # Make sure this tag is the same as the tag for the chart in the
+      # local-path-provisioner GitRepository
+      tag: "v0.0.20-gh1"
     resources:
       requests:
         cpu: 200m

flux2/infrastructure/sources/kustomization.yaml

@@ -11,6 +11,7 @@ resources:
   - local-path-provisioner.yaml
   - nextcloud.yaml
   - prometheus-community.yaml
+  - rocketchat-helm-chart.yaml
   - single-sign-on.yaml
   - vmware-tanzu.yaml
   - wekan.yaml

flux2/infrastructure/sources/local-path-provisioner.yaml

@@ -7,7 +7,10 @@ spec:
   # The interval at which to check the upstream for updates
   interval: 1h
   # The repository URL, can be a HTTP/S or SSH address
-  url: https://github.com/rancher/local-path-provisioner
+  #
+  # We need to use our own fork of the local-path-provisioner until
+  # https://github.com/rancher/local-path-provisioner/issues/85 is resolved
+  url: https://open.greenhost.net/openappstack/local-path-provisioner
   # The Git reference to checkout and monitor for changes
   # (defaults to master)
   # For all available options, see:

flux2/infrastructure/sources/rocketchat-helm-chart.yaml

+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: rocketchat-helm-chart
+spec:
+  # The interval at which to check the upstream for updates
+  interval: 1h
+  # The repository URL, can be a HTTP/S or SSH address
+  url: https://github.com/greenhost/rocketchat-helm-chart
+  # The Git reference to checkout and monitor for changes
+  # (defaults to master)
+  # For all available options, see:
+  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
+  ref:
+    branch: openappstack
+    tag: 3.1.0-gh2