Update code

tasks/longhorn.yml

@@ -10,57 +10,10 @@
         context: "{{ my_context }}"
         name: longhorn
         chart_ref: longhorn/longhorn
-        chart_version: "{{ storage_longhorn.version }}"
+        chart_version: "{{ storage_longhorn_version }}"
         create_namespace: true
-        release_namespace: "{{ storage_longhorn.namespace }}"
-        values:
-          persistence:
-            defaultClass: true
-#            defaultClassReplicaCount: 3
-#            reclaimPolicy: Delete
-            recurringJobSelector:
-              enable: true
-              jobList: '[
-                {
-                  "name":"snapshot",
-                  "isGroup":true,
-                },
-                {
-                  "name":"backup-daily",
-                  "isGroup":true,
-                }
-              ]'
-          defaultSettings:
-            defaultDataPath: "/var/lib/longhorn/"
-            backupTarget: "nfs://longhorn-test-nfs-svc.default:/opt/backupstore"
-            allowRecurringJobWhileVolumeDetached: true
-            createDefaultDiskLabeledNodes: true
-            replicaSoftAntiAffinity: false
-#            defaultReplicaCount: 2
-            defaultDataLocality: best-effort
-#            defaultLonghornStaticStorageClass: longhorn
-#            disableSchedulingOnCordonedNode: false
-            replicaZoneSoftAntiAffinity: false
-            guaranteed-engine-manager-cpu: 6
-            guaranteed-replica-manager-cpu: 6
-          ingress:
-            enabled: true
-            host: "longhorn.{{ cluster_domain }}"
-#            tls: false
-#            tlsSecret: longhorn.local-tls
-            annotations:
-              kubernetes.io/ingress.class: traefik
-#              cert-manager.io/cluster-issuer: letsencrypt-prod
-# {% if ingress_whitelist is defined %}
-#              ingress.kubernetes.io/whitelist-source-range: "{% for acl_whitelist in ingress_whitelist %}{{ acl_whitelist }}{% if not loop.last %}, {% endif %}{% endfor %}"
-# {% endif %}
-              traefik.ingress.kubernetes.io/router.entrypoints: web,websecure
-# {% if basic_auth is defined %}
-#              traefik.ingress.kubernetes.io/router.middlewares: {{ traefik_namespace }}-traefik-dashboard-basicauth@kubernetescrd
-#              traefik.ingress.kubernetes.io/router.middlewares: basic-auth@file
-#              #traefik.ingress.kubernetes.io/router.middlewares: tools-traefik-ipwhitelist@kubernetescrd,tools-basic-auth@kubernetescrd
-# {% endif %}
-#          enablePSP: true
+        release_namespace: "{{ storage_longhorn_namespace }}"
+        values: "{{ lookup('template', 'longhorn/longhorn-values.yaml.j2') | from_yaml }}"
 
     - name: Configure Longhorn
       kubernetes.core.k8s:
@@ -92,7 +45,7 @@
         state: present
         context: "{{ my_context }}"
         apply: true
-        namespace: "{{ storage_longhorn.namespace }}"
+        namespace: "{{ storage_longhorn_namespace }}"
         resource_definition: "{{ lookup('template', 'longhorn/longhorn/longhorn_recurringjob.yml.j2') | from_yaml }}"
       with_items:
         - {
@@ -113,12 +66,12 @@
 #        state: present
 #        context: "{{ my_context }}"
 #        apply: true
-#        namespace: "{{ storage_longhorn.namespace }}"
+#        namespace: "{{ storage_longhorn_namespace }}"
 #        resource_definition: "{{ lookup('template', 'longhorn/' + item) | from_yaml }}"
 #      with_items:
 #        - "longhorn_ingressroute.yaml.j2"
   when:
-    - storage_longhorn.enabled
+    - storage_longhorn_enabled
   tags:
     - longhorn
     - storage
@@ -130,19 +83,19 @@
         context: "{{ my_context }}"
         name: longhorn
         state: absent
-        release_namespace: "{{ storage_longhorn.namespace }}"
+        release_namespace: "{{ storage_longhorn_namespace }}"
 
     - name: Remove Ingress for longhorn UI
       kubernetes.core.k8s:
         state: absent
         context: "{{ my_context }}"
-        namespace: "{{ storage_longhorn.namespace }}"
+        namespace: "{{ storage_longhorn_namespace }}"
         resource_definition: "{{ lookup('template', 'longhorn/' + item) | from_yaml }}"
       with_items:
 #        - "longhorn_ingressroute.yaml.j2"
         - "longhorn-namespace.yml.j2"
   when:
-    - not storage_longhorn.enabled
+    - not storage_longhorn_enabled
   tags:
     - longhorn
     - storage