[stable/apm-server] Add optional TLS configuration to the chart (helm…

…#14305) * [stable/apm-server] Add optional TLS configuration to the chart Signed-off-by: Amit Oren <[email protected]> * [stable/apm-server] Bump chart version Signed-off-by: Amit Oren <[email protected]>
davidkarlsen · Jul 3, 2019 · d865172 · d865172
1 parent 50f7856
commit d865172
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/stable/apm-server/Chart.yaml b/stable/apm-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: The server receives data from the Elastic APM agents and stores the data into a datastore like Elasticsearch
 icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg
 name: apm-server
-version: 2.1.3
+version: 2.1.4
 appVersion: 7.0.0
 home: https://www.elastic.co/solutions/apm
 sources:

diff --git a/stable/apm-server/README.md b/stable/apm-server/README.md
@@ -61,6 +61,7 @@ The following table lists the configurable parameters of the apm-server chart an
 | `ingress.annotations`               | Kubernetes ingress annotations           | None                                |
 | `ingress.labels`                    | Kubernetes service labels                | None                                |
 | `ingress.hosts`                     | List of ingress accepted hostnames       | apm-server-ingress.example.com      |
+| `ingress.tls`                       | Ingress TLS configuration	             | `[]`                                |
 | `rbac.create`                       | If true, create & use RBAC resources | `true`                                  |
 | `rbac.serviceAccount`               | existing ServiceAccount to use (ignored if rbac.create=true) | `default`       |
 | `config`                            | The content of the configuration file consumed by apm-server. See the [apm-server documentation](https://www.elastic.co/guide/en/beats/apm-server/current/apm-server-reference-yml.html) for full details | |

diff --git a/stable/apm-server/templates/ingress.yaml b/stable/apm-server/templates/ingress.yaml
@@ -21,6 +21,16 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
   backend:
     serviceName: {{ $serviceName }}
     servicePort: {{ $servicePort }}

diff --git a/stable/apm-server/values.yaml b/stable/apm-server/values.yaml
@@ -62,6 +62,10 @@ ingress:
   labels: {}
   hosts:
     - apm-server-ingress.example.com
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
 
 config:
   apm-server: