Merge branch '605_extra_flux_install' into 'master'

Allow second, custom flux instance

See merge request openappstack/openappstack!313

ansible/group_vars/all/settings.yml.example

@@ -60,6 +60,21 @@ flux:
   # repo, not the one specified above
   local_flux: false
 
+
+# Additional custom flux installation, needs to be enabled under `enabled_applications` below.
+# see https://docs.openappstack.net/en/latest/customization.html for details
+# and https://github.com/fluxcd/flux/tree/master/chart/flux#configuration for
+# possibe values.
+#
+# i.e.:
+#
+# flux-custom_extra_values:
+#   git:
+#     repo: "https://github.com/me/my_flux_config"
+#     branch: "master"
+#   …
+
+
 helm_operator:
   # You can add extra parameters to the helm-operator helm install command
   # see https://docs.fluxcd.io/projects/helm-operator/en/stable/references/chart/
@@ -78,6 +93,11 @@ enabled_applications:
   - 'single-sign-on'
   # The backup system Velero is disabled by default, see settings under `backup` above.
   # - 'velero'
+  #
+  # Additional custom flux installation, disabled by default.
+  # see https://docs.openappstack.net/en/latest/customization.html for details
+  # - 'flux-custom'
+  #
   # Applications.
   - 'grafana'
   - 'loki-stack'

ansible/roles/apps/tasks/core.yml

@@ -3,6 +3,7 @@
   tags:
     - kubernetes
     - namespace
+    - flux
   k8s:
     name: '{{ item }}'
     api_version: v1
@@ -13,6 +14,7 @@
     - 'oas-apps'
     - 'cert-manager'
     - 'velero'
+    - 'oas-custom'
 
 - name: Install helm-operator
   tags:

ansible/roles/apps/tasks/flux-custom.yml

+---
+
+- name: Create Kubernetes secret with flux-custom settings
+  tags:
+    - config
+    - flux
+    - flux-custom
+  vars:
+    flux_secret:
+      name: "flux-custom"
+      namespace: "oas-custom"
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - flux-custom

ansible/roles/apps/tasks/main.yml

@@ -36,3 +36,6 @@
 - name: Tasks pertaining to velero
   import_tasks: velero.yml
   when: backup.s3.enabled
+
+- name: Tasks pertaining to flux-custom
+  import_tasks: flux-custom.yml

ansible/roles/apps/templates/settings/flux-custom.yaml

+---
+# Since flux-custom needs to get configured entrirely by the user, so we
+# don't provide any defaults. Please refer to
+# https://docs.openappstack.net/en/latest/customization.html for how to
+# configure your custom flux installation.
+#
+# Since ansible can't combine() an empty dictionary we provide one dummy
+# default value here.
+
+git:
+  branch: master

flux/oas/flux-custom.yaml

+---
+apiVersion: helm.fluxcd.io/v1
+kind: HelmRelease
+metadata:
+  name: flux-custom
+  namespace: oas-custom
+  annotations:
+    flux.weave.works/automated: "false"
+spec:
+  releaseName: flux-custom
+  chart:
+    name: flux
+    repository: https://charts.fluxcd.io
+    version: 1.3.0
+  valuesFrom:
+  - secretKeyRef:
+      name: flux-custom-settings
+      key: values.yaml