Helm node selector, tolerations support and affinity

Sharathmk99 · adamjensenbot · commit 7afdc63915e5 · 2023-04-11T12:32:21.000+02:00
diff --git a/deployments/liqo/README.md b/deployments/liqo/README.md
@@ -24,6 +24,9 @@
 | awsConfig.clusterName | string | `""` | name of the EKS cluster |
 | awsConfig.region | string | `""` | AWS region where the clsuter is runnnig |
 | awsConfig.secretAccessKey | string | `""` | secretAccessKey for the Liqo user |
+| common.affinity | object | `{}` |  |
+| common.nodeSelector | object | `{}` | nodeSelector for all liqo services, excluding virtual kubelet deployment |
+| common.tolerations | list | `[]` | tolerations for all liqo services, excluding virtual kubelet deployment |
 | controllerManager.config.enableNodeFailureController | bool | `false` | Ensure offloaded pods running on a failed node are evicted and rescheduled on a healthy node, preventing them to remain in a terminating state indefinitely. This feature can be useful in case of remote node failure to guarantee better service continuity and to have the expected pods workload on the remote cluster. However, enabling this feature could produce zombies in the worker node, in case the node returns Ready again without a restart |
 | controllerManager.config.enableResourceEnforcement | bool | `false` | It enforces offerer-side that offloaded pods do not exceed offered resources (based on container limits). This feature is suggested to be enabled when consumer-side enforcement is not sufficient. It has the same tradeoffs of resource quotas (i.e, it requires all offloaded pods to have resource limits set). |
 | controllerManager.config.offerUpdateThresholdPercentage | string | `""` | the threshold (in percentage) of resources quantity variation which triggers a ResourceOffer update. |
diff --git a/deployments/liqo/templates/liqo-auth-deployment.yaml b/deployments/liqo/templates/liqo-auth-deployment.yaml
@@ -126,3 +126,15 @@ spec:
       volumes:
         - name: certs
           emptyDir: {}
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
diff --git a/deployments/liqo/templates/liqo-controller-manager-deployment.yaml b/deployments/liqo/templates/liqo-controller-manager-deployment.yaml
@@ -187,3 +187,15 @@ spec:
         secret:
           secretName: {{ include "liqo.prefixedName" $webhookConfig }}-certs
           defaultMode: 420
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
diff --git a/deployments/liqo/templates/liqo-crd-replicator-deployment.yaml b/deployments/liqo/templates/liqo-crd-replicator-deployment.yaml
@@ -52,4 +52,16 @@ spec:
                   name: {{ include "liqo.clusterIdConfig" . }}
                   key: CLUSTER_NAME
           resources: {{- toYaml .Values.crdReplicator.pod.resources | nindent 12 }}
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
 ---
diff --git a/deployments/liqo/templates/liqo-discovery-deployment.yaml b/deployments/liqo/templates/liqo-discovery-deployment.yaml
@@ -60,5 +60,16 @@ spec:
                   fieldPath: metadata.namespace
           resources: {{- toYaml .Values.discovery.pod.resources | nindent 12 }}
       hostNetwork: true
-
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/deployments/liqo/templates/liqo-gateway-deployment.yaml b/deployments/liqo/templates/liqo-gateway-deployment.yaml
@@ -73,5 +73,16 @@ spec:
             - name: WIREGUARD_IMPLEMENTATION
               value: {{ .Values.gateway.config.wireguardImplementation }}
       hostNetwork: true
-
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/deployments/liqo/templates/liqo-metric-agent-deployment.yaml b/deployments/liqo/templates/liqo-metric-agent-deployment.yaml
@@ -72,5 +72,16 @@ spec:
       volumes:
         - name: certs
           emptyDir: {}
-
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/deployments/liqo/templates/liqo-network-manager-deployment.yaml b/deployments/liqo/templates/liqo-network-manager-deployment.yaml
@@ -59,5 +59,16 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
           resources: {{- toYaml .Values.networkManager.pod.resources | nindent 12 }}
-
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/deployments/liqo/templates/liqo-proxy-deployment.yaml b/deployments/liqo/templates/liqo-proxy-deployment.yaml
@@ -43,3 +43,15 @@ spec:
       - name: config-volume
         configMap:
           name: {{ include "liqo.prefixedName" $proxyConfig }}
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
diff --git a/deployments/liqo/templates/liqo-telemetry-cronjob.yaml b/deployments/liqo/templates/liqo-telemetry-cronjob.yaml
@@ -50,5 +50,16 @@ spec:
               {{- include "liqo.concatenateMap" $d | nindent 14 }}
               {{- end }}
             resources: {{- toYaml .Values.telemetry.pod.resources | nindent 14 }}
-
+          {{- if ((.Values.common).nodeSelector) }}
+          nodeSelector:
+          {{- toYaml .Values.common.nodeSelector | nindent 12 }}
+          {{- end }}
+          {{- if ((.Values.common).tolerations) }}
+          tolerations:
+          {{- toYaml .Values.common.tolerations | nindent 12 }}
+          {{- end }}
+          {{- if ((.Values.common).affinity) }}
+          affinity:
+          {{- toYaml .Values.common.affinity | nindent 12 }}
+          {{- end }}
 {{- end }}
diff --git a/deployments/liqo/templates/pre-delete-job.yaml b/deployments/liqo/templates/pre-delete-job.yaml
@@ -42,3 +42,15 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
         resources: {{- toYaml .Values.uninstaller.pod.resources | nindent 10 }}
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
diff --git a/deployments/liqo/templates/webhooks/job-patch/job-patch-webhook.yaml b/deployments/liqo/templates/webhooks/job-patch/job-patch-webhook.yaml
@@ -34,3 +34,15 @@ spec:
       serviceAccountName: {{ include "liqo.prefixedName" $rbacConfig }}
       securityContext:
         {{- include "liqo.podSecurityContext" . | nindent 8 }}
+      {{- if ((.Values.common).nodeSelector) }}
+      nodeSelector:
+      {{- toYaml .Values.common.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).tolerations) }}
+      tolerations:
+      {{- toYaml .Values.common.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if ((.Values.common).affinity) }}
+      affinity:
+      {{- toYaml .Values.common.affinity | nindent 8 }}
+      {{- end }}
diff --git a/deployments/liqo/values.yaml b/deployments/liqo/values.yaml
@@ -403,3 +403,11 @@ networkConfig:
   # The default value is configured to ensure correct functioning regardless of the combination of the underlying environments
   # (e.g., cloud providers). This guarantees improved compatibility at the cost of possible limited performance drops.
   mtu: 1340
+
+common:
+  # -- nodeSelector for all liqo services, excluding virtual kubelet deployment
+  nodeSelector: {}
+  # -- tolerations for all liqo services, excluding virtual kubelet deployment
+  tolerations: []
+  # affinity for all liqo services, excluding virtual kubelet deployment
+  affinity: {}
