Fix node selector for DaemonSet and NGC (#75)

Signed-off-by: v.oleynikov <[email protected]>

Author: duckhawk

templates/linstor-csi/controller.yaml

@@ -156,10 +156,8 @@ spec:
       {{- include "helm_lib_tolerations" (tuple . "any-node" "storage-problems") | nindent 6 }}
       {{- include "helm_lib_priority_class" (tuple . "cluster-medium") | nindent 6 }}
       {{- include "helm_lib_module_pod_security_context_run_as_user_root" . | nindent 6 }}
-{{- if dig "dataNodes" "nodeSelector" false .Values.sdsReplicatedVolume }}
       nodeSelector:
-        {{- .Values.sdsReplicatedVolume.dataNodes.nodeSelector | toYaml | nindent 8 }}
-{{- end }}
+        storage.deckhouse.io/sds-replicated-volume-node: ""
       affinity: {}
       containers:
       - args:

templates/nodegroupconfiguration-drbd-install-altlinux-like.yaml

@@ -42,11 +42,7 @@ spec:
 
     kernel_version_in_use="$(uname -r)"
 
-    {{- if dig "dataNodes" "nodeSelector" false .Values.sdsReplicatedVolume }}
-    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({{ .Values.sdsReplicatedVolume.dataNodes.nodeSelector | toJson }})')
-    {{- else }}
-    is_linstor_data_node="true"
-    {{- end }}
+    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({"storage.deckhouse.io/sds-replicated-volume-node":""})')
 
     bb-log-info "we need drbd on node: "$is_linstor_data_node
 

templates/nodegroupconfiguration-drbd-install-centos-like.yaml

@@ -42,11 +42,7 @@ spec:
 
     kernel_version_in_use="$(uname -r)"
 
-    {{- if dig "dataNodes" "nodeSelector" false .Values.sdsReplicatedVolume }}
-    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({{ .Values.sdsReplicatedVolume.dataNodes.nodeSelector | toJson }})')
-    {{- else }}
-    is_linstor_data_node="true"
-    {{- end }}
+    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({"storage.deckhouse.io/sds-replicated-volume-node":""})')
 
     bb-log-info "we need drbd on node: "$is_linstor_data_node
 

templates/nodegroupconfiguration-drbd-install-debian-like.yaml

@@ -42,11 +42,7 @@ spec:
 
     kernel_version_in_use="$(uname -r)"
 
-    {{- if dig "dataNodes" "nodeSelector" false .Values.sdsReplicatedVolume }}
-    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({{ .Values.sdsReplicatedVolume.dataNodes.nodeSelector | toJson }})')
-    {{- else }}
-    is_linstor_data_node="true"
-    {{- end }}
+    is_linstor_data_node=$(bb-kubectl --kubeconfig $kubeconfig  get node "$(hostname -s)" -o json | jq -c '.metadata.labels | contains({"storage.deckhouse.io/sds-replicated-volume-node":""})')
 
     bb-log-info "we need drbd on node: "$is_linstor_data_node