Merge branch '295-re-add-cert-manager-to-installed-helmfile-releases' into 'master'

Resolve "Re-add cert-manager to installed helmfile releases"

Closes #295

See merge request openappstack/openappstack!81

.gitlab-ci.yml

@@ -178,9 +178,11 @@ behave-grafana:
 terminate_droplet_after_merge:
   stage: cleanup
   script: |
-    if [ "$(git cat-file -p HEAD | grep -c '^parent')" -gt 1 ]
+    if [ "$(git show -s --pretty=%p HEAD | wc -w)" -gt 1 ]
     then
-      pipeline=$(git cat-file -p 893aed0e1f1ce02a77b8f2a66ad03c24f09915d9 | grep 'Merge branch' | tr -dc '0-9')
+      subject="$(git show -s --format=%s)"
+      tmp="${subject#*\'}"
+      pipeline="${tmp%%\-*}"
       echo "Current HEAD is a merge commit, removing droplet from related merge request pipeline #${pipeline}."
       python3 -c "import greenhost_cloud; greenhost_cloud.terminate_droplets_by_name(\"^ci-${pipeline}\.\")"
     else

ansible/group_vars/all/oas.yml

@@ -49,7 +49,6 @@ rke:
   checksum: 'sha256:7c05727aa3d6f8c4b5f60b057f1fe7883af48d5a778e3b1668f178dda84883ee'
 
 cert_manager:
-  version: '0.9.1'
   # cert-manager requires custom resource definitions applied before installing
   # the helm chart. See https://hub.helm.sh/charts/jetstack/cert-manager for
   # details

ansible/roles/apps/tasks/cert-manager.yml

@@ -39,3 +39,20 @@
       server: "https://acme-staging-v02.api.letsencrypt.org/directory"
     - name: production
       server: "https://acme-v02.api.letsencrypt.org/directory"
+
+- name: Apply cert-manager helmfile
+  tags:
+    - helmfile
+    - cert-manager
+  shell: |
+    set -e -x -o pipefail
+    /usr/local/bin/helmfile \
+    -b /snap/bin/helm \
+    -e oas \
+    -f {{ data_directory }}/source/helmfiles/helmfile.d/05-cert-manager.yaml \
+    apply \
+    --suppress-secrets \
+    | sed 's/\x1B\[[0-9;]*[JKmsu]//g' \
+    >> {{ log_directory }}/helmfile.log
+  args:
+    executable: /bin/bash

ansible/roles/apps/tasks/helmfiles.yml

@@ -23,6 +23,14 @@
     - NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}"
     - NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}"
     - GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
-  shell: /usr/local/bin/helmfile -b /snap/bin/helm -e oas -f {{ data_directory }}/source/helmfiles/helmfile.d/{{ item }}.yaml apply --suppress-secrets | sed 's/\x1B\[[0-9;]*[JKmsu]//g' >> {{ log_directory }}/helmfile.log
+  shell: |
+    set -e -x -o pipefail
+    /usr/local/bin/helmfile -b /snap/bin/helm -e oas \
+    -f {{ data_directory }}/source/helmfiles/helmfile.d/{{ item }}.yaml \
+    apply --suppress-secrets \
+    | sed 's/\x1B\[[0-9;]*[JKmsu]//g' \
+    >> {{ log_directory }}/helmfile.log
+  args:
+    executable: /bin/bash
   with_items: "{{ helmfiles }}"
   when: item is not search("cert-manager")

helmfiles/helmfile.d/05-cert-manager.yaml

@@ -11,7 +11,7 @@ releases:
   - name: "oas-{{ .Environment.Values.releaseName }}-cert-manager"
     namespace: "cert-manager"
     chart: "jetstack/cert-manager"
-    version: '{{ cert_manager.version }}'
+    version: "0.9.1"
     values:
     - "../values/cert-manager.yaml.gotmpl"
     wait: false