Add pobLabels support to csi and oidc (#744)
spiffe-csi-driver and spiffe-oidc-discovery provider are now brought in line with spire-server and spire-agent, which already support podLabels. Changes: * Add podLabels parameter Fixes #719 Signed-off-by: Rowan Ruseler <[email protected]> Co-authored-by: kfox1111 <[email protected]>
This commit is contained in:
co-authored by
kfox1111
parent
6b5d01b74c
commit
141c8865a3
@@ -51,6 +51,7 @@ A Helm chart to install the SPIFFE CSI driver.
|
|||||||
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
|
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |
|
||||||
| `serviceAccount.name` | The name of the service account to use. If not set and create is true, a name is generated. | `""` |
|
| `serviceAccount.name` | The name of the service account to use. If not set and create is true, a name is generated. | `""` |
|
||||||
| `podAnnotations` | Pod annotations for spiffe-csi-driver | `{}` |
|
| `podAnnotations` | Pod annotations for spiffe-csi-driver | `{}` |
|
||||||
|
| `podLabels` | Labels to add to pods | `{}` |
|
||||||
| `podSecurityContext` | Security context for CSI driver pods | `{}` |
|
| `podSecurityContext` | Security context for CSI driver pods | `{}` |
|
||||||
| `securityContext` | Security context for CSI driver containers | `{}` |
|
| `securityContext` | Security context for CSI driver containers | `{}` |
|
||||||
| `nodeSelector` | Node selector for CSI driver pods | `{}` |
|
| `nodeSelector` | Node selector for CSI driver pods | `{}` |
|
||||||
|
|||||||
@@ -31,6 +31,9 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "spiffe-csi-driver.selectorLabels" . | nindent 8 }}
|
{{- include "spiffe-csi-driver.selectorLabels" . | nindent 8 }}
|
||||||
|
{{- with .Values.podLabels }}
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
{{- with .Values.imagePullSecrets }}
|
{{- with .Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -91,6 +91,9 @@ serviceAccount:
|
|||||||
## @param podAnnotations [object] Pod annotations for spiffe-csi-driver
|
## @param podAnnotations [object] Pod annotations for spiffe-csi-driver
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
|
||||||
|
## @param podLabels [object] Labels to add to pods
|
||||||
|
podLabels: {}
|
||||||
|
|
||||||
## @param podSecurityContext [object] Security context for CSI driver pods
|
## @param podSecurityContext [object] Security context for CSI driver pods
|
||||||
podSecurityContext: {}
|
podSecurityContext: {}
|
||||||
# fsGroup: 2000
|
# fsGroup: 2000
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
|
|||||||
| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `5` |
|
| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `5` |
|
||||||
| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` |
|
| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` |
|
||||||
| `podAnnotations` | Pod annotations for Spire OIDC discovery provider | `{}` |
|
| `podAnnotations` | Pod annotations for Spire OIDC discovery provider | `{}` |
|
||||||
|
| `podLabels` | Labels to add to pods | `{}` |
|
||||||
| `tls.spire.enabled` | Use spire to secure the oidc-discovery-provider | `true` |
|
| `tls.spire.enabled` | Use spire to secure the oidc-discovery-provider | `true` |
|
||||||
| `tls.externalSecret.enabled` | Provide your own certificate/key via tls style Kubernetes Secret | `false` |
|
| `tls.externalSecret.enabled` | Provide your own certificate/key via tls style Kubernetes Secret | `false` |
|
||||||
| `tls.externalSecret.secretName` | Specify which Secret to use | `""` |
|
| `tls.externalSecret.secretName` | Specify which Secret to use | `""` |
|
||||||
|
|||||||
@@ -30,6 +30,9 @@ spec:
|
|||||||
release: {{ .Release.Name }}
|
release: {{ .Release.Name }}
|
||||||
release-namespace: {{ .Release.Namespace }}
|
release-namespace: {{ .Release.Namespace }}
|
||||||
component: oidc-discovery-provider
|
component: oidc-discovery-provider
|
||||||
|
{{- with .Values.podLabels }}
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
spec:
|
spec:
|
||||||
{{- with .Values.imagePullSecrets }}
|
{{- with .Values.imagePullSecrets }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
|
|||||||
@@ -125,6 +125,9 @@ livenessProbe:
|
|||||||
## @param podAnnotations [object] Pod annotations for Spire OIDC discovery provider
|
## @param podAnnotations [object] Pod annotations for Spire OIDC discovery provider
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
|
|
||||||
|
## @param podLabels [object] Labels to add to pods
|
||||||
|
podLabels: {}
|
||||||
|
|
||||||
# Select from one of the options below to be the source of certificates for OIDC Discovery Provider.
|
# Select from one of the options below to be the source of certificates for OIDC Discovery Provider.
|
||||||
# If none are enabled, connections won't be TLS encrypted.
|
# If none are enabled, connections won't be TLS encrypted.
|
||||||
tls:
|
tls:
|
||||||
|
|||||||
Reference in New Issue
Block a user