Merge pull request #24 from colearendt/improve-generic-values

allow customizing command and args for the generic chart
colearendt · Jan 19, 2022 · 5a1677b · 5a1677b
2 parents fa7adbd + 37b8133
commit 5a1677b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml
@@ -3,7 +3,7 @@ name: generic
 description: A generic Helm chart for Kubernetes
 
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: latest
 maintainers:
   - name: colearendt

diff --git a/charts/generic/NEWS.md b/charts/generic/NEWS.md
@@ -1,3 +1,7 @@
+# 0.2.1
+
+- Add customization for `command` and `args`
+
 # 0.2.0
 
 - BREAKING: move `podAnnotations` into `pod.annotations`

diff --git a/charts/generic/README.md b/charts/generic/README.md
@@ -1,6 +1,6 @@
 # generic
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 A generic Helm chart for Kubernetes
 
@@ -15,10 +15,12 @@ A generic Helm chart for Kubernetes
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
+| args | list | `[]` | args for the pod's primary container. Default is the container's default "command" |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| command | list | `[]` | command for the pod's primary container. Default is the container's default entrypoint |
 | extraObjects | list | `[]` | Extra kubernetes objects to deploy (value evaluted as a template) |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |

diff --git a/charts/generic/ci/all-values.yaml b/charts/generic/ci/all-values.yaml
@@ -23,6 +23,12 @@ pod:
   securityContext: {}
     # fsGroup: 2000
 
+command:
+  - "sh"
+  - "-c"
+args:
+  - "'echo hi'"
+
 serviceAccount:
   # -- Specifies whether a service account should be created
   create: true

diff --git a/charts/generic/templates/deployment.yaml b/charts/generic/templates/deployment.yaml
@@ -42,6 +42,14 @@ spec:
             - name: http
               containerPort: {{ .Values.pod.port }}
               protocol: TCP
+          {{- with .Values.command }}
+          command:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.args }}
+          args:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.readinessProbe }}
           readinessProbe:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/generic/values.yaml b/charts/generic/values.yaml
@@ -22,6 +22,11 @@ pod:
   securityContext: {}
     # fsGroup: 2000
 
+# -- command for the pod's primary container. Default is the container's default entrypoint
+command: []
+# -- args for the pod's primary container. Default is the container's default "command"
+args: []
+
 storage:
   name: ''
   create: false