chore(bors): merge pull request #616

616: feat(chart): add eviction tolerations to localpv,dsp operator,csi controller r=niladrih a=niladrih

Changes:
- Add eviction tolerations to the dsp operator deployment, csi-controller
- Update localpv provisioner chart to 4.2
- rename `tolerations_with_early_eviction` to `_tolerations_with_early_eviction_two` to avoid conflict with the localpv-provisioner _helpers.tpl function with the same name

Co-authored-by: Niladri Halder <niladri.halder26@gmail.com>

chart/Chart.yaml

@@ -45,6 +45,6 @@ dependencies:
     repository: https://nats-io.github.io/k8s/helm/charts/
     condition: eventing.enabled
   - name: localpv-provisioner
-    version: 4.1.4
+    version: 4.2.0
     repository: https://openebs.github.io/dynamic-localpv-provisioner
     condition: localpv-provisioner.enabled

chart/README.md

@@ -59,7 +59,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | https://grafana.github.io/helm-charts | loki-stack | 2.9.11 |
 | https://jaegertracing.github.io/helm-charts | jaeger-operator | 2.50.1 |
 | https://nats-io.github.io/k8s/helm/charts/ | nats | 0.19.14 |
-| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.1.4 |
+| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.2.0 |
 
 ## Values
 

chart/templates/_helpers.tpl

@@ -182,9 +182,9 @@ Usage:
 {{/*
 Creates the tolerations based on the global and component wise tolerations, with early eviction
 Usage:
-{{ include "tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.path.to.local.tolerations) }}
+{{ include "_tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.path.to.local.tolerations) }}
 */}}
-{{- define "tolerations_with_early_eviction" -}}
+{{- define "_tolerations_with_early_eviction" -}}
 {{- toYaml .template.Values.earlyEvictionTolerations | nindent 8 }}
 {{- if .localTolerations }}
     {{- toYaml .localTolerations | nindent 8 }}

chart/templates/mayastor/agents/core/agent-core-deployment.yaml

@@ -31,7 +31,7 @@ spec:
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-      {{- if $tolerations := include "tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.agents.core.tolerations) }}
+      {{- if $tolerations := include "_tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.agents.core.tolerations) }}
       tolerations: {{ $tolerations }}
       {{- end }}
       containers:

chart/templates/mayastor/apis/api-rest-deployment.yaml

@@ -30,7 +30,7 @@ spec:
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-      {{- if $tolerations := include "tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.apis.rest.tolerations) }}
+      {{- if $tolerations := include "_tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.apis.rest.tolerations) }}
       tolerations: {{ $tolerations }}
       {{- end }}
       containers:

chart/templates/mayastor/csi/csi-controller-deployment.yaml

@@ -34,7 +34,7 @@ spec:
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-      {{- if $tolerations := include "tolerations" (dict "template" . "localTolerations" .Values.csi.controller.tolerations) }}
+      {{- if $tolerations := include "_tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.csi.controller.tolerations) }}
       tolerations: {{ $tolerations }}
       {{- end }}
       containers:

chart/templates/mayastor/operators/operator-diskpool-deployment.yaml

@@ -31,7 +31,7 @@ spec:
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
       {{- end }}
-      {{- if $tolerations := include "tolerations" (dict "template" . "localTolerations" .Values.operators.pool.tolerations) }}
+      {{- if $tolerations := include "_tolerations_with_early_eviction" (dict "template" . "localTolerations" .Values.operators.pool.tolerations) }}
       tolerations: {{ $tolerations }}
       {{- end }}
       containers: