Try #7:

openebs · Aug 1, 2022 · e7203b6 · e7203b6
2 parents c0c69d6 + 01943f9
commit e7203b6
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 7 deletions.
diff --git a/chart/README.md b/chart/README.md
diff --git a/chart/templates/mayastor/agents/agent-core-deployment.yaml b/chart/templates/mayastor/agents/agent-core-deployment.yaml
@@ -20,6 +20,9 @@ spec:
         {{- include "base_pull_secrets" . }}
       initContainers:
         {{- include "base_init_core_containers" . }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
       containers:
         - name: agent-core
           resources:

diff --git a/chart/templates/mayastor/apis/api-rest-deployment.yaml b/chart/templates/mayastor/apis/api-rest-deployment.yaml
@@ -19,6 +19,9 @@ spec:
         {{- include "base_pull_secrets" . }}
       initContainers:
         {{- include "base_init_containers" . }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
       containers:
         - name: api-rest
           resources:

diff --git a/chart/templates/mayastor/csi/csi-controller-deployment.yaml b/chart/templates/mayastor/csi/csi-controller-deployment.yaml
@@ -23,9 +23,12 @@ spec:
       initContainers:
         {{- include "jaeger_agent_init_container" . }}
         {{- include "rest_agent_init_container" . }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.1
+          image: "{{ .Values.csi.image.registry }}/{{ .Values.csi.image.repo }}/csi-provisioner:{{ .Values.csi.image.provisionerTag }}"
           args:
             - "--v=2"
             - "--csi-address=$(ADDRESS)"
@@ -35,19 +38,19 @@ spec:
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
+          imagePullPolicy: {{ .Values.csi.image.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
-          image: k8s.gcr.io/sig-storage/csi-attacher:v3.2.1
+          image: "{{ .Values.csi.image.registry }}/{{ .Values.csi.image.repo }}/csi-attacher:{{ .Values.csi.image.attacherTag }}"
           args:
             - "--v=2"
             - "--csi-address=$(ADDRESS)"
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
-          imagePullPolicy: "IfNotPresent"
+          imagePullPolicy: {{ .Values.csi.image.pullPolicy }}
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/

diff --git a/chart/templates/mayastor/csi/csi-node-daemonset.yaml b/chart/templates/mayastor/csi/csi-node-daemonset.yaml
@@ -23,8 +23,9 @@ spec:
       hostNetwork: true
       imagePullSecrets:
         {{- include "base_pull_secrets" . }}
-      nodeSelector:
-        kubernetes.io/arch: amd64
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
       # NOTE: Each container must have mem/cpu limits defined in order to
       # belong to Guaranteed QoS class, hence can never get evicted in case of
       # pressure unless they exceed those limits. limits and requests must be
@@ -78,7 +79,8 @@ spec:
             cpu: {{ .Values.csi.node.resources.requests.cpu | quote }}
             memory: {{ .Values.csi.node.resources.requests.memory | quote }}
       - name: csi-driver-registrar
-        image: quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
+        image: "{{ .Values.csi.image.registry }}/{{ .Values.csi.image.repo }}/csi-node-driver-registrar:{{ .Values.csi.image.registrarTag }}"
+        imagePullPolicy: {{ .Values.csi.image.pullPolicy }}
         args:
         - "--csi-address=/csi/csi.sock"
         - "--kubelet-registration-path={{ .Values.csi.node.kubeletDir }}/plugins/io.openebs.mayastor/csi.sock"

diff --git a/chart/templates/mayastor/operators/operator-diskpool-deployment.yaml b/chart/templates/mayastor/operators/operator-diskpool-deployment.yaml
@@ -20,6 +20,9 @@ spec:
         {{- include "base_pull_secrets" . }}
       initContainers:
         {{- include "base_init_containers" . }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector: {{- toYaml .Values.nodeSelector | nindent 8 }}
+      {{- end }}
       containers:
         - name: operator-diskpool
           resources:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -8,6 +8,13 @@ image:
   # imagePullPolicy for all Mayastor images
   pullPolicy: Always
 
+# Node labels for pod assignment
+# ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+# Note that if multi-arch images support 'kubernetes.io/arch: amd64'
+# should be removed and set 'nodeSelector' to empty '{}' as default value.
+nodeSelector:
+  kubernetes.io/arch: amd64
+
 base:
   # request timeout for rest & core agents
   default_req_timeout: 5s
@@ -131,6 +138,20 @@ license:
       memory: "32Mi"
 
 csi:
+  image:
+    # image registry to pull all CSI Sidecar images
+    registry: k8s.gcr.io
+    # image registry's namespace
+    repo: sig-storage
+    # imagePullPolicy for all CSI Sidecar images
+    pullPolicy: IfNotPresent
+    # csi-provisioner image release tag
+    provisionerTag: v2.2.1
+    # csi-attacher image release tag
+    attacherTag: v3.2.1
+    # csi-node-driver-registrar image release tag
+    registrarTag: v2.1.0
+
   controller:
   # logLevel for the csi controller
     logLevel: info
@@ -172,6 +193,8 @@ mayastor:
   # WARNING: Lowering metricsPollingInterval value will affect performance adversely
   metricsPollingInterval: "5m"
   # node selectors to designate mayastor nodes for diskpool creation
+  # Note that if multi-arch images support 'kubernetes.io/arch: amd64'
+  # should be removed.
   nodeSelector:
     openebs.io/engine: mayastor
     kubernetes.io/arch: amd64