Merge pull request #952 from msau42/update-helm

Update local provisioner helm chart
kubernetes-retired · Aug 21, 2018 · 5c0f5de · 5c0f5de
2 parents df74190 + 60ea854
commit 5c0f5de
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 25 deletions.
diff --git a/local-volume/helm/README.md b/local-volume/helm/README.md
@@ -54,7 +54,8 @@ provisioner chart and their default values.
 | common.rbac                            | Generating RBAC (Role Based Access Control) objects.                                                  | bool     | `true`                                                     |
 | common.namespace                       | Namespace where provisioner runs.                                                                     | str      | `default`                                                  |
 | common.useAlphaAPI                     | If running against pre-1.10 k8s version, the `useAlphaAPI` flag must be enabled.                      | bool     | `false`                                                    |
-| common.useJobForCleaning               | Is set to true, provisioner will use jobs-based block cleaning.                                       | bool     | `false`                                                    |
+| common.useJobForCleaning               | If set to true, provisioner will use jobs-based block cleaning.                                       | bool     | `false`                                                    |
+| common.useNodeNameOnly                 | If set to true, provisioner name will only use Node.Name and not Node.UID.                            | bool     | `false`                                                    |
 | common.minResyncPeriod                 | Resync period in reflectors will be random between `minResyncPeriod` and `2*minResyncPeriod`.         | str      | `5m0s`
 | common.configMapName                   | Provisioner ConfigMap name.                                                                           | str      | `local-provisioner-config`                                 |
 | classes.[n].name                       | StorageClass name.                                                                                    | str      | `-`                                                        |

diff --git a/local-volume/helm/examples/gce-pre1.9.yaml b/local-volume/helm/examples/gce-pre1.9.yaml
@@ -1,5 +1,6 @@
 common:
   useAlphaAPI: true
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks"

diff --git a/local-volume/helm/examples/gce-retain.yaml b/local-volume/helm/examples/gce-retain.yaml
@@ -1,3 +1,5 @@
+common:
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks/by-uuid/google-local-ssds-scsi-fs"

diff --git a/local-volume/helm/examples/gce.yaml b/local-volume/helm/examples/gce.yaml
@@ -2,6 +2,7 @@ common:
   # Beta PV.NodeAffinity field is used by default. If running against pre-1.10
   # k8s version, the `useAlphaAPI` flag must be enabled in the configMap.
   useAlphaAPI: false
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks/by-uuid/google-local-ssds-scsi-fs"

diff --git a/local-volume/helm/examples/gke.yaml b/local-volume/helm/examples/gke.yaml
@@ -1,3 +1,5 @@
+common:
+  useNodeNameOnly: true
 classes:
 - name: local-scsi
   hostDir: "/mnt/disks"

diff --git a/local-volume/helm/provisioner/templates/provisioner.yaml b/local-volume/helm/provisioner/templates/provisioner.yaml
@@ -16,6 +16,9 @@ data:
 {{- if .Values.common.useJobForCleaning }}
   useJobForCleaning: "yes"
 {{- end}}
+{{- if .Values.common.useNodeNameOnly }}
+  useNodeNameOnly: "true"
+{{- end }}
 {{- if .Values.common.minResyncPeriod }}
   minResyncPeriod: {{ .Values.common.minResyncPeriod | quote }}
 {{- end}}

diff --git a/local-volume/helm/provisioner/values.yaml b/local-volume/helm/provisioner/values.yaml
@@ -21,6 +21,11 @@ common:
   #
   useJobForCleaning: false
   #
+  # Provisioner name contains Node.UID by default. If set to true, the provisioner
+  # name will only use Node.Name.
+  #
+  useNodeNameOnly: false
+  #
   # Resync period in reflectors will be random between minResyncPeriod and
   # 2*minResyncPeriod. Default: 5m0s.
   #
@@ -67,7 +72,7 @@ daemonset:
   #
   # Defines Provisioner's image name including container registry.
   #
-  image: quay.io/external_storage/local-volume-provisioner:v2.1.0
+  image: quay.io/external_storage/local-volume-provisioner:v2.2.0
   #
   # Defines Image download policy, see kubernetes documentation for available values.
   #
@@ -94,4 +99,4 @@ daemonset:
   #
   # If configured, resources will set the requests/limits field to the Daemonset PodSpec.
   # Ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-  resources: {}
+  resources: {}
diff --git a/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml b/local-volume/helm/test/expected/baremetal-cleanbyjobs.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/baremetal-resyncperiod.yaml b/local-volume/helm/test/expected/baremetal-resyncperiod.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/baremetal-tolerations.yaml b/local-volume/helm/test/expected/baremetal-tolerations.yaml
@@ -35,7 +35,7 @@ spec:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -49,7 +49,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml b/local-volume/helm/test/expected/baremetal-with-resource-limits.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -53,7 +53,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/baremetal-without-rbac.yaml b/local-volume/helm/test/expected/baremetal-without-rbac.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -45,7 +45,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/baremetal.yaml b/local-volume/helm/test/expected/baremetal.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +46,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/gce-pre1.9.yaml b/local-volume/helm/test/expected/gce-pre1.9.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: default
 data:
   useAlphaAPI: "true"
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks
@@ -30,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -44,7 +45,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/gce-retain.yaml b/local-volume/helm/test/expected/gce-retain.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -32,7 +33,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +47,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/gce.yaml b/local-volume/helm/test/expected/gce.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -32,7 +33,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -46,7 +47,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/helm/test/expected/gke.yaml b/local-volume/helm/test/expected/gke.yaml
@@ -6,6 +6,7 @@ metadata:
   name: local-provisioner-config
   namespace: default
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |
     local-scsi:
        hostDir: /mnt/disks
@@ -29,7 +30,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           name: provisioner
           securityContext:
             privileged: true
@@ -43,7 +44,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: JOB_CONTAINER_IMAGE
-            value: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+            value: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           volumeMounts:
             - mountPath: /etc/provisioner/config
               name: provisioner-config

diff --git a/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml b/local-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_count.yaml
@@ -7,6 +7,7 @@ metadata:
   name: local-provisioner-config 
   namespace: default 
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |     
     local-scsi:
        hostDir: /mnt/disks
@@ -30,7 +31,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           imagePullPolicy: "Always"
           name: provisioner 
           securityContext:

diff --git a/...l-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml b/...l-volume/provisioner/deployment/kubernetes/gce/provisioner_generated_gce_ssd_volumes.yaml
@@ -7,6 +7,7 @@ metadata:
   name: local-provisioner-config 
   namespace: default 
 data:
+  useNodeNameOnly: "true"
   storageClassMap: |     
     local-scsi:
        hostDir: /mnt/disks/by-uuid/google-local-ssds-scsi-fs
@@ -33,7 +34,7 @@ spec:
     spec:
       serviceAccountName: local-storage-admin
       containers:
-        - image: "quay.io/external_storage/local-volume-provisioner:v2.1.0"
+        - image: "quay.io/external_storage/local-volume-provisioner:v2.2.0"
           imagePullPolicy: "Always"
           name: provisioner 
           securityContext: