From 32ae7edb41d2c3fe7899484e2b511f7d537c5a8a Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Fri, 25 Mar 2022 20:49:21 +0100
Subject: [PATCH] Update longhorn deployment

---
 tasks/longhorn.yml | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/tasks/longhorn.yml b/tasks/longhorn.yml
index 26a119a..7bac9ee 100644
--- a/tasks/longhorn.yml
+++ b/tasks/longhorn.yml
@@ -39,13 +39,14 @@
             backupTarget: "nfs://longhorn-test-nfs-svc.default:/opt/backupstore"
             allowRecurringJobWhileVolumeDetached: true
             createDefaultDiskLabeledNodes: true
-#            createDefaultDiskLabeledNodes: true
             replicaSoftAntiAffinity: false
 #            defaultReplicaCount: 2
-            defaultDataLocality: disabled
+            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 }}"
@@ -61,18 +62,44 @@
 #{% 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
 
-    - name: Install longhorn UI Ingress
+    - name: Configure Longhorn
       kubernetes.core.k8s:
         state: present
         context: "{{ my_context }}"
-        apply: true
-        namespace: "{{ storage_longhorn.namespace }}"
-        resource_definition: "{{ lookup('template', 'longhorn/' + item) | from_yaml }}"
+        definition:
+          kind: Setting
+          apiVersion: longhorn.io/v1beta1
+          metadata:
+            name: "{{ item.name }}"
+            namespace: "{{ storage_longhorn_namespace }}"
+          value: "{{ item.value }}"
       with_items:
-        - "longhorn_ingressroute.yaml.j2"
+        - {
+            name: "guaranteed-engine-manager-cpu",
+            value: "6"
+          }
+        - {
+            name: "guaranteed-replica-manager-cpu",
+            value: "6"
+          }
+        - {
+            name: "default-data-locality",
+            value: "best-effort"
+          }
+
+#    - name: Install longhorn UI Ingress
+#      kubernetes.core.k8s:
+#        state: present
+#        context: "{{ my_context }}"
+#        apply: true
+#        namespace: "{{ storage_longhorn.namespace }}"
+#        resource_definition: "{{ lookup('template', 'longhorn/' + item) | from_yaml }}"
+#      with_items:
+#        - "longhorn_ingressroute.yaml.j2"
     when:
       - storage_longhorn.enabled
     tags: