panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add extraEnvVars support for spiffe-csi-driver containers (#496)

Browse Source 
Signed-off-by: Patrick O'Brien <[email protected]>
Signed-off-by: Patrick O’Brien <[email protected]>
This commit is contained in:
Patrick O'Brien
2024-11-17 13:25:29 -08:00
committed by GitHub
parent dc30efb5eb
commit 6608fc980a
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spiffe-csi-driver/README.md
+2
View File
@@ -33,6 +33,7 @@ A Helm chart to install the SPIFFE CSI driver.
| `image.pullPolicy` | The image pull policy | `IfNotPresent` | | `image.pullPolicy` | The image pull policy | `IfNotPresent` |
| `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` | | `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` |
| `resources` | Resource requests and limits for spiffe-csi-driver | `{}` | | `resources` | Resource requests and limits for spiffe-csi-driver | `{}` |
| `extraEnvVars` | Extra environment variables to be added to the spiffe-csi-driver container | `[]` |
| `healthChecks.port` | The healthcheck port for spiffe-csi-driver | `9809` | | `healthChecks.port` | The healthcheck port for spiffe-csi-driver | `9809` |
| `updateStrategy.type` | The update strategy to use to replace existing DaemonSet pods with new pods. Can be RollingUpdate or OnDelete. | `RollingUpdate` | | `updateStrategy.type` | The update strategy to use to replace existing DaemonSet pods with new pods. Can be RollingUpdate or OnDelete. | `RollingUpdate` |
| `updateStrategy.rollingUpdate.maxUnavailable` | Max unavailable pods during update. Can be a number or a percentage. | `1` | | `updateStrategy.rollingUpdate.maxUnavailable` | Max unavailable pods during update. Can be a number or a percentage. | `1` |
@@ -61,6 +62,7 @@ A Helm chart to install the SPIFFE CSI driver.
| `nodeDriverRegistrar.image.pullPolicy` | The image pull policy | `IfNotPresent` | | `nodeDriverRegistrar.image.pullPolicy` | The image pull policy | `IfNotPresent` |
| `nodeDriverRegistrar.image.tag` | Overrides the image tag | `v2.9.4` | | `nodeDriverRegistrar.image.tag` | Overrides the image tag | `v2.9.4` |
| `nodeDriverRegistrar.resources` | Resource requests and limits for CSI driver pods | `{}` | | `nodeDriverRegistrar.resources` | Resource requests and limits for CSI driver pods | `{}` |
| `nodeDriverRegistrar.extraEnvVars` | Extra environment variables to be added to the nodeDriverRegistrar container | `[]` |
| `agentSocketPath` | The unix socket path to the spire-agent | `/run/spire/agent-sockets/spire-agent.sock` | | `agentSocketPath` | The unix socket path to the spire-agent | `/run/spire/agent-sockets/spire-agent.sock` |
| `kubeletPath` | Path to kubelet file | `/var/lib/kubelet` | | `kubeletPath` | Path to kubelet file | `/var/lib/kubelet` |
| `priorityClassName` | Priority class assigned to daemonset pods. Can be auto set with global.recommendations.priorityClassName. | `""` | | `priorityClassName` | Priority class assigned to daemonset pods. Can be auto set with global.recommendations.priorityClassName. | `""` |
charts/spire/charts/spiffe-csi-driver/templates/daemonset.yaml
+7
View File
@@ -90,6 +90,9 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
{{- with .Values.extraEnvVars }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts: volumeMounts:
# The volume containing the SPIRE agent socket. The SPIFFE CSI # The volume containing the SPIRE agent socket. The SPIFFE CSI
# driver will mount this directory into containers. # driver will mount this directory into containers.
@@ -123,6 +126,10 @@ spec:
"-kubelet-registration-path", "{{ .Values.kubeletPath }}/plugins/{{ .Values.pluginName }}/csi.sock", "-kubelet-registration-path", "{{ .Values.kubeletPath }}/plugins/{{ .Values.pluginName }}/csi.sock",
"-health-port", "{{ .Values.healthChecks.port }}" "-health-port", "{{ .Values.healthChecks.port }}"
] ]
env:
{{- with .Values.nodeDriverRegistrar.extraEnvVars }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts: volumeMounts:
# The registrar needs access to the SPIFFE CSI driver socket # The registrar needs access to the SPIFFE CSI driver socket
- mountPath: /spiffe-csi - mountPath: /spiffe-csi
charts/spire/charts/spiffe-csi-driver/values.yaml
+5
View File
@@ -33,6 +33,9 @@ resources: {}
# cpu: 100m # cpu: 100m
# memory: 64Mi # memory: 64Mi
## @param extraEnvVars [array] Extra environment variables to be added to the spiffe-csi-driver container
extraEnvVars: []
healthChecks: healthChecks:
## @param healthChecks.port The healthcheck port for spiffe-csi-driver ## @param healthChecks.port The healthcheck port for spiffe-csi-driver
port: 9809 port: 9809
@@ -136,6 +139,8 @@ nodeDriverRegistrar:
# limits: # limits:
# cpu: 100m # cpu: 100m
# memory: 64Mi # memory: 64Mi
## @param nodeDriverRegistrar.extraEnvVars [array] Extra environment variables to be added to the nodeDriverRegistrar container
extraEnvVars: []
## @param agentSocketPath The unix socket path to the spire-agent ## @param agentSocketPath The unix socket path to the spire-agent
agentSocketPath: /run/spire/agent-sockets/spire-agent.sock agentSocketPath: /run/spire/agent-sockets/spire-agent.sock