Merge branch '411-install-latest-nextcloud-chart-2' into 'master'

Resolve "Install latest nextcloud chart"

Closes #411 and #539

See merge request openappstack/openappstack!246

ansible/roles/apps/tasks/flux.yml

@@ -19,7 +19,7 @@
   #   helm-operator
   #   # Chart name
   #   helm-operator
-  shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 0.3.0 --set createCRD=true --set chartsSyncInterval=20m --set statusUpdateInterval=30s helm-operator helm-operator
+  shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 0.7.0 --set createCRD=true --set chartsSyncInterval=20m --set statusUpdateInterval=30s --set helm.versions=v2 helm-operator helm-operator
 
 - name: Create Kubernetes secret with local-storage settings
   tags:

ansible/roles/apps/templates/nextcloud-settings.yaml

@@ -2,6 +2,9 @@ nextcloud:
   nextcloud:
     host: "files.{{ domain }}"
     password: "{{ nextcloud_password }}"
+  cronjob:
+    # Set curl to accept insecure connections when acme staging is used
+    curlInsecure: "{{ acme_staging }}"
 
   ingress:
     enabled: true
@@ -94,6 +97,8 @@ rabbitmq:
     existingClaim: "nextcloud-rabbitmq"
 
 redis:
+  cluster:
+    enabled: false
   persistence:
     existingClaim: "nextcloud-redis"
 

flux/nextcloud.yaml

@@ -11,10 +11,11 @@ spec:
   releaseName: nc
   chart:
     git: https://open.greenhost.net/openappstack/nextcloud
-    ref: b5f54e09a0fc29d3c041ecea0d9310c8283d4dae
+    ref: 2a19b8c65f7f1ebc24c3a875245c36f882e323f3
     path: .
   valuesFrom:
     - secretKeyRef:
         name: nextcloud-settings
         key: values.yaml
   timeout: 1800
+  wait: true

flux/wordpress.yaml

@@ -9,7 +9,7 @@ spec:
   releaseName: wordpress
   chart:
     git: https://code.greenhost.net/open/wordpress-helm
-    ref: a114e276777b2e25357ff8307dfb712c3e7a9689
+    ref: 85ac49b0e4914c2902ae137464951046c9c2e0c2
     path: .
   valuesFrom:
     - secretKeyRef:

test/pytest/test_helmreleases.py

@@ -94,7 +94,7 @@ def run_around_tests():
 def test_helmreleases(host):
     """
     Checks if all desired HelmReleases installed by weave flux are in
-    DEPLOYED state.
+    'deployed' state.
     """
     custom_objects = client.CustomObjectsApi()
 
@@ -103,9 +103,9 @@ def test_helmreleases(host):
     for namespace in EXPECTED_RELEASES:
         for app in EXPECTED_RELEASES[namespace]:
             app_status = get_release_status(app, namespace, custom_objects)
-            if app_status != 'DEPLOYED':
+            if app_status != 'deployed':
                 failed += 1
-    assert failed == 0, "Error: {} apps not 'DEPLOYED'!".format(failed)
+    assert failed == 0, "Error: {} apps not 'deployed'!".format(failed)
 
 
 @pytest.mark.apps_running