chore(bors): merge pull request #606

606: Cherry-pick PR 605 to release/2.7 r=niladrih a=niladrih



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

Author: mayastor-bors

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.2
+    version: 4.1.4
     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.2 |
+| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.1.4 |
 
 ## Values
 
@@ -189,6 +189,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | io_engine.​tolerations | Set tolerations, overrides global | `[]` |
 | localpv-provisioner.​enabled | Enables the openebs dynamic-localpv-provisioner. If disabled, modify etcd and loki-stack storage class accordingly. | `true` |
 | localpv-provisioner.​hostpathClass.​enabled | Enable default hostpath localpv StorageClass. | `false` |
+| localpv-provisioner.​localpv.​priorityClassName | Set the PriorityClass for the LocalPV Hostpath provisioner Deployment. | `"{{ .Release.Name }}-cluster-critical"` |
 | loki-stack.​enabled | Enable loki log collection for our components | `true` |
 | loki-stack.​localpvScConfig.​basePath | Host path where local etcd data is stored in. | `"/var/local/{{ .Release.Name }}/localpv-hostpath/loki"` |
 | loki-stack.​localpvScConfig.​reclaimPolicy | ReclaimPolicy of loki's localpv hostpath storage class. | `"Delete"` |

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

@@ -20,7 +20,7 @@ spec:
         {{ include "label_prefix" . }}/version: {{ .Chart.Version }}
         {{ include "label_prefix" . }}/logging: "true"
     spec:
-      serviceAccount: {{ .Release.Name }}-service-account
+      serviceAccountName: {{ .Release.Name }}-service-account
       imagePullSecrets:
         {{- include "base_pull_secrets" . }}
       initContainers:

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

@@ -21,14 +21,14 @@ spec:
         {{ include "label_prefix" . }}/logging: "true"
     spec:
       hostNetwork: true
-      serviceAccount: {{ .Release.Name }}-service-account
+      serviceAccountName: {{ .Release.Name }}-service-account
       dnsPolicy: ClusterFirstWithHostNet
       imagePullSecrets:
         {{- include "base_pull_secrets" . }}
       initContainers:
         {{- include "jaeger_collector_init_container" . }}
         {{- include "rest_agent_init_container" . }}
-      {{- if $pcName := include "priority_class" (dict "template" . "localPriorityClass" .Values.csi.controller.priorityClassName) }}
+      {{- if $pcName := include "priority_class_with_default" (dict "template" . "localPriorityClass" .Values.csi.controller.priorityClassName) }}
       priorityClassName: {{ $pcName }}
       {{- end }}
       {{- if .Values.nodeSelector }}

chart/templates/mayastor/csi/csi-node-daemonset.yaml

@@ -27,7 +27,7 @@ spec:
         {{ include "label_prefix" . }}/version: {{ .Chart.Version }}
         {{ include "label_prefix" . }}/logging: "true"
     spec:
-      serviceAccount: {{ .Release.Name }}-service-account
+      serviceAccountName: {{ .Release.Name }}-service-account
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       imagePullSecrets:

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

@@ -20,12 +20,12 @@ spec:
         {{ include "label_prefix" . }}/version: {{ .Chart.Version }}
         {{ include "label_prefix" . }}/logging: "true"
     spec:
-      serviceAccount: {{ .Release.Name }}-service-account
+      serviceAccountName: {{ .Release.Name }}-service-account
       imagePullSecrets:
         {{- include "base_pull_secrets" . }}
       initContainers:
         {{- include "base_init_containers" . }}
-      {{- if $pcName := include "priority_class" (dict "template" . "localPriorityClass" .Values.operators.pool.priorityClassName) }}
+      {{- if $pcName := include "priority_class_with_default" (dict "template" . "localPriorityClass" .Values.operators.pool.priorityClassName) }}
       priorityClassName: {{ $pcName }}
       {{- end }}
       {{- if .Values.nodeSelector }}

chart/values.yaml

@@ -826,6 +826,11 @@ storageClass:
 localpv-provisioner:
   # -- Enables the openebs dynamic-localpv-provisioner. If disabled, modify etcd and loki-stack storage class accordingly.
   enabled: true
+
+  localpv:
+    # -- Set the PriorityClass for the LocalPV Hostpath provisioner Deployment.
+    priorityClassName: "{{ .Release.Name }}-cluster-critical"
+
   hostpathClass:
     # -- Enable default hostpath localpv StorageClass.
     enabled: false