Merge pull request #1322 from FutureMatt/extra-volume-mounts

Added the ability to apply extra volumes, volume mounts and host aliases to the daemonset

Author: k8s-ci-robot

charts/vsphere-cpi/README.md

@@ -118,12 +118,16 @@ The following table lists the configurable parameters of the vSphere CPI chart a
 | `daemonset.cmdline.logging`              | Logging level                       |  2                                     |
 | `daemonset.cmdline.cloudConfig.dir`      | vSphere conf directory              |  /etc/cloud                            |
 | `daemonset.cmdline.cloudConfig.file`     | vSphere conf filename               |  vsphere.conf                          |
-| `daemonset.replicaCount`                 | Node resources                      | `[]`                                   |
+| `daemonset.replicaCount`                 | Node resources                      | 1                                      |
 | `daemonset.resources`                    | Node resources                      | `[]`                                   |
 | `daemonset.podAnnotations`               | Annotations for CPI pod             |  nil                                   |
 | `daemonset.podLabels`                    | Labels for CPI pod                  |  nil                                   |
 | `daemonset.nodeSelector`                 | User-defined node selectors         |  nil                                   |
 | `daemonset.tolerations`                  | User-defined tolerations            |  nil                                   |
+| `daemonset.affinity`                     | User-defined affinities             |  nil                                   |
+| `daemonset.extraVolumes`                 | User-defined volumes                |  `[]`                                  |
+| `daemonset.extraVolumeMounts`            | User-defined volume mounts          |  `[]`                                  |
+| `daemonset.hostAliases`                  | User-defined host aliases           |  `[]`                                  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` using Helm v3.X. For example,
 

charts/vsphere-cpi/templates/configmap.yaml

@@ -21,6 +21,8 @@ data:
       port: 443
       {{- if $config.thumbprint }}
       thumbprint: {{ $config.thumbprint }}
+      {{- else if $config.caFile }}
+      ca-file: {{ $config.caFile }}
       {{- else }}
       # set insecure-flag to true if the vCenter uses a self-signed cert
       insecureFlag: true

charts/vsphere-cpi/templates/daemonset.yaml

@@ -47,6 +47,10 @@ spec:
     {{- if .Values.daemonset.affinity }}
       affinity:
         {{- toYaml .Values.daemonset.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.daemonset.hostAliases }}
+      hostAliases:
+        {{- toYaml .Values.daemonset.hostAliases | nindent 8 }}
     {{- end }}
       {{- if .Values.securityContext.enabled }}
       securityContext:
@@ -72,6 +76,9 @@ spec:
           - mountPath: {{ .Values.daemonset.cmdline.cloudConfig.dir }}
             name: vsphere-config-volume
             readOnly: true
+        {{- if .Values.daemonset.extraVolumeMounts }}
+          {{- toYaml .Values.daemonset.extraVolumeMounts | nindent 10 }}
+        {{- end }}
         {{- if .Values.daemonset.resources }}
         resources:
           {{- toYaml .Values.daemonset.resources | nindent 10 }}
@@ -80,3 +87,6 @@ spec:
         - name: vsphere-config-volume
           configMap:
             name: {{ if $config.enabled }}{{- $config.name }}{{- else }}cloud-config{{- end }}
+      {{- if .Values.daemonset.extraVolumes }}
+        {{- toYaml .Values.daemonset.extraVolumes | nindent 8 }}
+      {{- end }}

charts/vsphere-cpi/values.yaml

@@ -12,6 +12,7 @@ config:
   region: "k8s-region"
   zone: "k8s-zone"
   thumbprint: ""
+  caFile: "" # Path to the ca-file if it has been mounted into the pod.
   secret:
     # Specifies whether Secret should be created from config values
     create: true
@@ -93,3 +94,6 @@ daemonset:
           - matchExpressions:
               - key: node-role.kubernetes.io/control-plane
                 operator: Exists
+  extraVolumes: []
+  extraVolumesMounts: []
+  hostAliases: []