From 322baa4a944f63443f7fd83ac4838dc8ce756aa0 Mon Sep 17 00:00:00 2001 From: Taehyun Kim Date: Tue, 8 Oct 2019 18:47:12 +0900 Subject: [PATCH] add extraEnv (#17770) Signed-off-by: Taehyun Kim --- stable/goldpinger/Chart.yaml | 2 +- stable/goldpinger/README.md | 49 +++++++++++----------- stable/goldpinger/templates/daemonset.yaml | 3 ++ stable/goldpinger/values.yaml | 2 + 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/stable/goldpinger/Chart.yaml b/stable/goldpinger/Chart.yaml index ed96310030..f49a93720b 100644 --- a/stable/goldpinger/Chart.yaml +++ b/stable/goldpinger/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: goldpinger -version: 1.1.4 +version: 1.2.0 appVersion: 1.5.0 description: Goldpinger makes calls between its instances for visibility and alerting. home: https://github.com/bloomberg/goldpinger diff --git a/stable/goldpinger/README.md b/stable/goldpinger/README.md index bbbfef3daa..6728316bd4 100644 --- a/stable/goldpinger/README.md +++ b/stable/goldpinger/README.md @@ -42,30 +42,31 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the Goldpinger chart and their default values. -| Parameter | Description | Default | -| ------------------------------- | ------------------------------- | ---------------------------------------------------------- | -| `image.repository` | Goldpinger image | `bloomberg/goldpinger` | -| `image.tag` | Goldpinger image tag | `1.5.0` | -| `pullPolicy` | Image pull policy | `IfNotPresent` | -| `rbac.create` | Install required rbac clusterrole | `true` | -| `serviceAccount.create` | Enable ServiceAccount creation | `true` | -| `serviceAccount.name` | ServiceAccount for Goldpinger pods | `default` | -| `goldpinger.port` | Goldpinger app port listen to | `80` | -| `service.type` | Kubernetes service type | `LoadBalancer` | -| `service.port` | Service HTTP port | `80` | -| `service.annotations` | Service annotations | `{}` | -| `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.path` | Ingress path | `/` | -| `ingress.hosts` | URLs to address your Goldpinger installation| `goldpinger.local` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `podAnnotations` | Pod annotations | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | List of node taints to tolerate | `[]` | -| `affinity` | Map of node/pod affinities | `{}` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `podSecurityPolicy.enabled` | Enable podSecuritypolicy | `false` | -| `podSecurityPolicy.policyName` | PodSecurityPolicy Name | `unrestricted-psp` | +| Parameter | Description | Default | +| ------------------------------ | -------------------------------------------- | ---------------------- | +| `image.repository` | Goldpinger image | `bloomberg/goldpinger` | +| `image.tag` | Goldpinger image tag | `1.5.0` | +| `pullPolicy` | Image pull policy | `IfNotPresent` | +| `rbac.create` | Install required rbac clusterrole | `true` | +| `serviceAccount.create` | Enable ServiceAccount creation | `true` | +| `serviceAccount.name` | ServiceAccount for Goldpinger pods | `default` | +| `goldpinger.port` | Goldpinger app port listen to | `80` | +| `extraEnv` | Extra environment variables | `[]` | +| `service.type` | Kubernetes service type | `LoadBalancer` | +| `service.port` | Service HTTP port | `80` | +| `service.annotations` | Service annotations | `{}` | +| `ingress.enabled` | Enable ingress controller resource | `false` | +| `ingress.annotations` | Ingress annotations | `{}` | +| `ingress.path` | Ingress path | `/` | +| `ingress.hosts` | URLs to address your Goldpinger installation | `goldpinger.local` | +| `ingress.tls` | Ingress TLS configuration | `[]` | +| `podAnnotations` | Pod annotations | `{}` | +| `nodeSelector` | Node labels for pod assignment | `{}` | +| `tolerations` | List of node taints to tolerate | `[]` | +| `affinity` | Map of node/pod affinities | `{}` | +| `resources` | CPU/Memory resource requests/limits | `{}` | +| `podSecurityPolicy.enabled` | Enable podSecuritypolicy | `false` | +| `podSecurityPolicy.policyName` | PodSecurityPolicy Name | `unrestricted-psp` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/stable/goldpinger/templates/daemonset.yaml b/stable/goldpinger/templates/daemonset.yaml index 6fe139dc36..6197b878f5 100644 --- a/stable/goldpinger/templates/daemonset.yaml +++ b/stable/goldpinger/templates/daemonset.yaml @@ -40,6 +40,9 @@ spec: value: "{{ .Values.goldpinger.port }}" - name: LABEL_SELECTOR value: "app.kubernetes.io/name={{ include "goldpinger.name" . }}" +{{- if .Values.extraEnv }} +{{ toYaml .Values.extraEnv | indent 10 }} +{{- end }} ports: - name: http containerPort: {{ .Values.goldpinger.port }} diff --git a/stable/goldpinger/values.yaml b/stable/goldpinger/values.yaml index 050a0193a1..357d24d840 100644 --- a/stable/goldpinger/values.yaml +++ b/stable/goldpinger/values.yaml @@ -21,6 +21,8 @@ serviceAccount: goldpinger: port: 80 +extraEnv: [] + service: type: LoadBalancer port: 80