From 6ee731e44607b7a2ce5c24178baf405173db17ed Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Sat, 26 Dec 2020 00:01:02 +0100
Subject: [PATCH] upd stork configuration

---
 helm/kube-linstor/templates/stork-deployment.yaml    | 10 +++++++++-
 .../templates/stork-scheduler-deployment.yaml        | 12 +++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/helm/kube-linstor/templates/stork-deployment.yaml b/helm/kube-linstor/templates/stork-deployment.yaml
index f929c0f..1645365 100644
--- a/helm/kube-linstor/templates/stork-deployment.yaml
+++ b/helm/kube-linstor/templates/stork-deployment.yaml
@@ -27,9 +27,17 @@ spec:
         command:
         - /stork
         - --driver=linstor
-        - --health-monitor=false
         - --leader-elect=true
+        - --lock-object-name={{ $fullName }}-stork
+        - --lock-object-namespace=$(NAMESPACE)
+        - --health-monitor=false
+        - --snapshotter=false
+        - --cluster-domain-controllers=false
         env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         - name: LS_CONTROLLERS
         {{- if not .Values.controller.ssl.enabled }}
           value: http://{{ $fullName }}-controller:{{ .Values.controller.port }}
diff --git a/helm/kube-linstor/templates/stork-scheduler-deployment.yaml b/helm/kube-linstor/templates/stork-scheduler-deployment.yaml
index 6d57f34..42e8b09 100644
--- a/helm/kube-linstor/templates/stork-scheduler-deployment.yaml
+++ b/helm/kube-linstor/templates/stork-scheduler-deployment.yaml
@@ -27,11 +27,17 @@ spec:
         command:
         - /usr/local/bin/kube-scheduler
         - --address=0.0.0.0
-        - --leader-elect=true
         - --scheduler-name=stork
         - --policy-configmap={{ $fullName }}-stork
-        - --policy-configmap-namespace={{ .Release.Namespace }}
-        - --lock-object-name=stork-scheduler
+        - --policy-configmap-namespace=$(NAMESPACE)
+        - --leader-elect=true
+        - --leader-elect-resource-name={{ $fullName }}-stork-scheduler
+        - --leader-elect-resource-namespace=$(NAMESPACE)
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
         livenessProbe:
           httpGet:
             path: /healthz