Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-04 06:47:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/deepspeed] fix: 🔒 Move service-account token auto-mount to pod declaration (#22393)

Browse Source 
* [bitnami/deepspeed] fix: 🔒 Move service-account token auto-mount to pod declaration

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

* test: ✅ Update goss test to reflect new value

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>

---------

Signed-off-by: Javier Salmeron Garcia <jsalmeron@vmware.com>
Signed-off-by: Javier J. Salmerón-García <jsalmeron@vmware.com>
This commit is contained in:
Javier J. Salmerón-García
2024-01-19 10:26:24 +01:00
committed by GitHub
parent c471e36129
commit 593a70df63
7 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vib/deepspeed/goss/goss.yaml
View File

@@ -35,7 +35,7 @@ command:
# or the one randomly defined by openshift (larger values). Othenrwise, the chart is still using the default value.
exec: if [ $(id -u) -lt {{ $uid }} ] || [ $(id -G | awk '{print $2}') -lt {{ $gid }} ]; then exit 1; fi
exit-status: 0
{{ if .Vars.client.serviceAccount.automountServiceAccountToken }}
{{ if .Vars.client.automountServiceAccountToken }}
check-sa:
exec: cat /var/run/secrets/kubernetes.io/serviceaccount/token | cut -d '.' -f 2 | xargs -I '{}' echo '{}====' | fold -w 4 | sed '$ d' | tr -d '\n' | base64 -d
exit-status: 0

2
.vib/deepspeed/runtime-parameters.yaml
View File

@@ -13,7 +13,7 @@ client:
runAsGroup: 1002
serviceAccount:
create: true
automountServiceAccountToken: true
automountServiceAccountToken: true
persistence:
enabled: true
mountPath: /bitnami/deepspeed/vib-test

2
bitnami/deepspeed/Chart.yaml
View File

@@ -35,4 +35,4 @@ name: deepspeed
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/deepspeed
- https://github.com/bitnami/charts/tree/main/bitnami/pytorch
version: 1.4.1
version: 1.5.0

2
bitnami/deepspeed/README.md
View File

@@ -161,6 +161,7 @@ The command removes all the Kubernetes components associated with the chart and
| `client.containerSecurityContext.seccompProfile.type` | Set Client container's Security Context seccomp profile | `RuntimeDefault` |
| `client.lifecycleHooks` | for the client container(s) to automate configuration before or after startup | `{}` |
| `client.runtimeClassName` | Name of the runtime class to be used by pod(s) | `""` |
| `client.automountServiceAccountToken` | Mount Service Account token in pod | `false` |
| `client.hostAliases` | client pods host aliases | `[]` |
| `client.labels` | Extra labels for the client deployment | `{}` |
| `client.podLabels` | Extra labels for client pods | `{}` |
@@ -260,6 +261,7 @@ The command removes all the Kubernetes components associated with the chart and
| `worker.containerSecurityContext.privileged` | Set Worker container's Security Context privileged | `false` |
| `worker.lifecycleHooks` | for the client container(s) to automate configuration before or after startup | `{}` |
| `worker.runtimeClassName` | Name of the runtime class to be used by pod(s) | `""` |
| `worker.automountServiceAccountToken` | Mount Service Account token in pod | `false` |
| `worker.hostAliases` | client pods host aliases | `[]` |
| `worker.labels` | Labels for the worker deployment | `{}` |
| `worker.annotations` | Annotations for the worker deployment | `{}` |

1
bitnami/deepspeed/templates/client/client-dep-job.yaml
View File

@@ -49,6 +49,7 @@ spec:
spec:
{{- include "deepspeed.v0.imagePullSecrets" . | nindent 6 }}
serviceAccountName: {{ template "deepspeed.v0.client.serviceAccountName" . }}
automountServiceAccountToken: {{ .Values.client.automountServiceAccountToken }}
{{- if .Values.client.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.client.hostAliases "context" $) | nindent 8 }}
{{- end }}

1
bitnami/deepspeed/templates/worker/worker-statefulset.yaml
View File

@@ -47,6 +47,7 @@ spec:
spec:
serviceAccountName: {{ template "deepspeed.v0.worker.serviceAccountName" . }}
{{- include "deepspeed.v0.imagePullSecrets" . | nindent 6 }}
automountServiceAccountToken: {{ .Values.worker.automountServiceAccountToken }}
{{- if .Values.worker.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.worker.hostAliases "context" $) | nindent 8 }}
{{- end }}

6
bitnami/deepspeed/values.yaml
View File

@@ -326,6 +326,9 @@ client:
## ref: https://kubernetes.io/docs/concepts/containers/runtime-class/
##https://github.com/microsoft/DeepSpeedExamples
runtimeClassName: ""
## @param client.automountServiceAccountToken Mount Service Account token in pod
##
automountServiceAccountToken: false
## @param client.hostAliases client pods host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
@@ -681,6 +684,9 @@ worker:
## ref: https://kubernetes.io/docs/concepts/containers/runtime-class/
##
runtimeClassName: ""
## @param worker.automountServiceAccountToken Mount Service Account token in pod
##
automountServiceAccountToken: false
## @param worker.hostAliases client pods host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##