csi/server.statefulset: custom security context #767
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,8 +5,11 @@ CHANGES: | |
| * Deprecated `injector.externalVaultAddr`. Added `global.externalVaultAddr`, which applies to both the Injector and the CSI Provider. [GH-745](https://github.com/hashicorp/vault-helm/pull/745) | ||
| * CSI Provider pods now set the `VAULT_ADDR` environment variable to either the internal Vault service or the configured external address. [GH-745](https://github.com/hashicorp/vault-helm/pull/745) | ||
| * Deprecated `injector.uid` and `injector.gid`. Replaced with `injector.securityContext.pod`. [GH-750](https://github.com/hashicorp/vault-helm/pull/750) | ||
| * injector: Allow setting securityContext for pod and container to be objects or YAML strings. [GH-767](https://github.com/hashicorp/vault-helm/pull/767) | ||
|
There was a problem hiding this comment. We could probably move this down/combine it with the entry on line 14 (just mention both PRs in the entry) since GH-750 hasn't been released yet. |
||
|
|
||
| Features: | ||
| * server: Add `server.statefulSet.securityContext` to override pod and container `securityContext`. [GH-767](https://github.com/hashicorp/vault-helm/pull/767) | ||
| * csi: Add `csi.daemonSet.securityContext` to override pod and container `securityContext`. [GH-767](https://github.com/hashicorp/vault-helm/pull/767) | ||
| * Add `server.service.activeNodePort` and `server.service.standbyNodePort` to specify the `nodePort` for active and standby services. [GH-610](https://github.com/hashicorp/vault-helm/pull/610) | ||
| * Support for setting annotations on the injector's serviceAccount [GH-753](https://github.com/hashicorp/vault-helm/pull/753) | ||
| * injector: Support setting both pod and container securityContext [GH-750](https://github.com/hashicorp/vault-helm/pull/750) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ spec: | |
| {{- end -}} | ||
| {{ template "csi.pod.annotations" . }} | ||
| spec: | ||
| {{ template "csi.daemonSet.securityContext.pod" . }} | ||
| {{- if .Values.csi.priorityClassName }} | ||
| priorityClassName: {{ .Values.csi.priorityClassName }} | ||
| {{- end }} | ||
|
|
@@ -42,6 +43,7 @@ spec: | |
| containers: | ||
| - name: {{ include "vault.name" . }}-csi-provider | ||
| {{ template "csi.resources" . }} | ||
| {{ template "csi.daemonSet.securityContext.container" . }} | ||
| image: "{{ .Values.csi.image.repository }}:{{ .Values.csi.image.tag }}" | ||
| imagePullPolicy: {{ .Values.csi.image.pullPolicy }} | ||
| args: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,13 +48,7 @@ spec: | |
| {{ if .Values.server.shareProcessNamespace }} | ||
| shareProcessNamespace: true | ||
| {{ end }} | ||
| {{- template "server.statefulSet.securityContext.pod" . }} | ||
| volumes: | ||
| {{ template "vault.volumes" . }} | ||
| - name: home | ||
|
|
@@ -72,10 +66,7 @@ spec: | |
| - "/bin/sh" | ||
| - "-ec" | ||
| args: {{ template "vault.args" . }} | ||
| {{- template "server.statefulSet.securityContext.container" . }} | ||
| env: | ||
| - name: HOST_IP | ||
| valueFrom: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -592,3 +592,59 @@ load _helpers | |
| yq -r 'map(select(.name=="VAULT_ADDR")) | .[] .value' | tee /dev/stderr) | ||
| [ "${value}" = "http://vault-outside" ] | ||
| } | ||
|
|
||
| #-------------------------------------------------------------------- | ||
| # securityContext | ||
|
|
||
| @test "csi/daemonset: default csi.daemonSet.securityContext.pod" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/csi-daemonset.yaml \ | ||
| --set 'csi.enabled=true' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.securityContext' | tee /dev/stderr) | ||
| [ "${actual}" = "null" ] | ||
| } | ||
|
|
||
| @test "csi/daemonset: default csi.daemonSet.securityContext.container" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/csi-daemonset.yaml \ | ||
| --set 'csi.enabled=true' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext' | tee /dev/stderr) | ||
| [ "${actual}" = "null" ] | ||
| } | ||
|
|
||
| @test "csi/daemonset: specify csi.daemonSet.securityContext.pod yaml" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/csi-daemonset.yaml \ | ||
| --set 'csi.enabled=true' \ | ||
| --set 'csi.daemonSet.securityContext.pod.foo=bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
|
|
||
| @test "csi/daemonset: specify csi.daemonSet.securityContext.container yaml" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/csi-daemonset.yaml \ | ||
| --set 'csi.enabled=true' \ | ||
| --set 'csi.daemonSet.securityContext.container.foo=bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
|
|
||
| @test "csi/daemonset: specify csi.daemonSet.securityContext.container yaml string" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/csi-daemonset.yaml \ | ||
| --set 'csi.enabled=true' \ | ||
| --set 'csi.daemonSet.securityContext.container=foo: bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1723,3 +1723,64 @@ load _helpers | |
| yq -r -c '.spec.template.spec.containers[0].env[] | select(.name == "VAULT_LICENSE_PATH")' | tee /dev/stderr) | ||
| [ "${actual}" = '' ] | ||
| } | ||
|
|
||
| #-------------------------------------------------------------------- | ||
| # securityContext | ||
|
|
||
| @test "server/standalone-StatefulSet: default statefulSet.securityContext.pod" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.securityContext' | tee /dev/stderr) | ||
| [ ! "${actual}" = "null" ] | ||
| } | ||
|
|
||
| @test "server/standalone-StatefulSet: default statefulSet.securityContext.container" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext' | tee /dev/stderr) | ||
| [ ! "${actual}" = "null" ] | ||
| } | ||
|
|
||
| @test "server/standalone-StatefulSet: specify statefulSet.securityContext.pod yaml" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| --set 'server.statefulSet.securityContext.pod.foo=bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
|
|
||
| @test "server/standalone-StatefulSet: specify statefulSet.securityContext.container yaml" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| --set 'server.statefulSet.securityContext.container.foo=bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
|
|
||
| @test "server/standalone-StatefulSet: specify statefulSet.securityContext.pod yaml string" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| --set 'server.statefulSet.securityContext.pod=foo: bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
|
|
||
| @test "server/standalone-StatefulSet: specify statefulSet.securityContext.container yaml string" { | ||
| cd `chart_dir` | ||
| local actual=$(helm template \ | ||
| --show-only templates/server-statefulset.yaml \ | ||
| --set 'server.statefulSet.securityContext.container=foo: bar' \ | ||
| . | tee /dev/stderr | | ||
| yq -r '.spec.template.spec.containers[0].securityContext.foo' | tee /dev/stderr) | ||
| [ "${actual}" = "bar" ] | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,23 @@ | |
| "providersDir": { | ||
| "type": "string" | ||
| }, | ||
| "securityContext": { | ||
| "type": "object", | ||
| "properties": { | ||
| "container": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| }, | ||
| "pod": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "updateStrategy": { | ||
| "type": "object", | ||
| "properties": { | ||
|
|
@@ -366,10 +383,16 @@ | |
| "type": "object", | ||
| "properties": { | ||
| "container": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| }, | ||
| "pod": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
|
|
@@ -905,6 +928,23 @@ | |
| "object", | ||
| "string" | ||
| ] | ||
| }, | ||
| "securityContext": { | ||
| "type": "object", | ||
| "properties": { | ||
| "container": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| }, | ||
| "pod": { | ||
| "type": [ | ||
| "object", | ||
| "string" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably remove this line, since this PR effectively un-deprecates
injector.uidandinjector.gid.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍