diff --git a/charts/library/common-test/tests/container/field_stdin_test.yaml b/charts/library/common-test/tests/container/field_stdin_test.yaml new file mode 100644 index 00000000..83034533 --- /dev/null +++ b/charts/library/common-test/tests/container/field_stdin_test.yaml @@ -0,0 +1,30 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json +suite: container stdin +templates: + - common.yaml +values: + - ../_values/controllers_main_default_container.yaml +tests: + - it: default should pass + asserts: + - documentIndex: 0 + isKind: + of: Deployment + - documentIndex: 0 + notExists: + path: spec.template.spec.containers[0].stdin + + - it: custom stdin should pass + set: + controllers.main.containers: + main: + stdin: true + asserts: + - documentIndex: 0 + isKind: + of: Deployment + - documentIndex: 0 + equal: + path: spec.template.spec.containers[0].stdin + value: true diff --git a/charts/library/common-test/tests/container/field_tty_test.yaml b/charts/library/common-test/tests/container/field_tty_test.yaml new file mode 100644 index 00000000..a3b86bcb --- /dev/null +++ b/charts/library/common-test/tests/container/field_tty_test.yaml @@ -0,0 +1,30 @@ +--- +# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json +suite: container tty +templates: + - common.yaml +values: + - ../_values/controllers_main_default_container.yaml +tests: + - it: default should pass + asserts: + - documentIndex: 0 + isKind: + of: Deployment + - documentIndex: 0 + notExists: + path: spec.template.spec.containers[0].tty + + - it: custom tty should pass + set: + controllers.main.containers: + main: + tty: true + asserts: + - documentIndex: 0 + isKind: + of: Deployment + - documentIndex: 0 + equal: + path: spec.template.spec.containers[0].tty + value: true diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml index 74b44590..e58c30b6 100644 --- a/charts/library/common/Chart.yaml +++ b/charts/library/common/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: common description: Function library for Helm charts type: library -version: 3.3.1 +version: 3.3.2 kubeVersion: ">=1.22.0-0" keywords: - common @@ -19,7 +19,7 @@ annotations: Added support for specifying unsupported raw resources. - kind: added description: |- - Added `stdin` and `tty` fields to container spec. + Added `stdin` and `tty` fields to container spec. (fixed in v3.3.2) - kind: added description: |- Added `persistentVolumeClaimRetentionPolicy` field to statefulset spec. diff --git a/charts/library/common/README.md b/charts/library/common/README.md index c5543104..5f946917 100644 --- a/charts/library/common/README.md +++ b/charts/library/common/README.md @@ -1,6 +1,6 @@ # common -![Version: 3.3.1](https://img.shields.io/badge/Version-3.3.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) +![Version: 3.3.2](https://img.shields.io/badge/Version-3.3.2-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) Function library for Helm charts @@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g. # Chart.yaml dependencies: - name: common - version: 3.3.1 + version: 3.3.2 repository: https://bjw-s.github.io/helm-charts/ ``` diff --git a/charts/library/common/templates/lib/container/_spec.tpl b/charts/library/common/templates/lib/container/_spec.tpl index e199c614..dcaf4ed0 100644 --- a/charts/library/common/templates/lib/container/_spec.tpl +++ b/charts/library/common/templates/lib/container/_spec.tpl @@ -52,10 +52,10 @@ resources: {{ toYaml . | trim | nindent 2 }} restartPolicy: {{ . | trim }} {{- end -}} {{- with $containerObject.stdin }} -stdin: {{ . | trim }} +stdin: {{ . }} {{- end -}} {{- with $containerObject.tty }} -tty: {{ . | trim }} +tty: {{ . }} {{- end -}} {{- with (include "bjw-s.common.lib.container.field.volumeMounts" (dict "ctx" $ctx) | trim) }} volumeMounts: {{ . | trim | nindent 2 }} diff --git a/charts/library/common/values.schema.json b/charts/library/common/values.schema.json index d4b4f643..c608433a 100644 --- a/charts/library/common/values.schema.json +++ b/charts/library/common/values.schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/draft-07/schema", - "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.3.1/charts/library/common/values.schema.json", + "$id": "https://raw.githubusercontent.com/bjw-s/helm-charts/common-3.3.2/charts/library/common/values.schema.json", "type": "object", "properties": {