From 08fc376647d43169743dcf04f1e88a2aec9e5f3d Mon Sep 17 00:00:00 2001 From: James Ritter Date: Wed, 11 Sep 2019 20:58:23 -0500 Subject: [PATCH] Fix space issue in volume mount (#17087) Update spacing issue in deployment, fixed README, and updated values to have a better example. Signed-off-by: James Ritter --- stable/elasticsearch-exporter/Chart.yaml | 2 +- stable/elasticsearch-exporter/README.md | 2 +- .../templates/deployment.yaml | 4 ++-- stable/elasticsearch-exporter/values.yaml | 14 ++++---------- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/stable/elasticsearch-exporter/Chart.yaml b/stable/elasticsearch-exporter/Chart.yaml index 211dd494a5..08a31e40ae 100644 --- a/stable/elasticsearch-exporter/Chart.yaml +++ b/stable/elasticsearch-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Elasticsearch stats exporter for Prometheus name: elasticsearch-exporter -version: 1.10.0 +version: 1.10.1 appVersion: 1.1.0 home: https://github.com/justwatchcom/elasticsearch_exporter sources: diff --git a/stable/elasticsearch-exporter/README.md b/stable/elasticsearch-exporter/README.md index 9dc4386d29..a1ad12506d 100644 --- a/stable/elasticsearch-exporter/README.md +++ b/stable/elasticsearch-exporter/README.md @@ -73,7 +73,7 @@ Parameter | Description | Default `es.ssl.enabled` | If true, a secure connection to Elasticsearch cluster is used | `false` `es.ssl.useExistingSecrets` | If true, certs from secretMounts will be used | `false` `es.ssl.ca.pem` | PEM that contains trusted CAs used for setting up secure Elasticsearch connection | -`es.ssl.ca.pemPath` | Path of ca pem file which should match a secretMount path | +`es.ssl.ca.path` | Path of ca pem file which should match a secretMount path | `es.ssl.client.pem` | PEM that contains the client cert to connect to Elasticsearch | `es.ssl.client.pemPath` | Path of client pem file which should match a secretMount path | `es.ssl.client.key` | Private key for client auth when connecting to Elasticsearch | diff --git a/stable/elasticsearch-exporter/templates/deployment.yaml b/stable/elasticsearch-exporter/templates/deployment.yaml index 808b33f0c6..dc598b13ca 100644 --- a/stable/elasticsearch-exporter/templates/deployment.yaml +++ b/stable/elasticsearch-exporter/templates/deployment.yaml @@ -147,6 +147,6 @@ spec: {{- end }} {{- range .Values.secretMounts }} - name: {{ .name }} - secret: - secretName: {{ .secretName }} + secret: + secretName: {{ .secretName }} {{- end }} diff --git a/stable/elasticsearch-exporter/values.yaml b/stable/elasticsearch-exporter/values.yaml index 1abe10cd22..1afdf51c3d 100644 --- a/stable/elasticsearch-exporter/values.yaml +++ b/stable/elasticsearch-exporter/values.yaml @@ -56,15 +56,9 @@ service: # A list of secrets and their paths to mount inside the pod # This is useful for mounting certificates for security secretMounts: [] -# - name: ca -# secretName: elastic-ca -# path: /ssl/ca.pem -# - name: elastic-client-pem -# secretName: elastic-client-pem -# path: /ssl/client.pem -# - name: elastic-client-key -# secretName: elastic-client-key -# path: /ssl/client.key +# - name: elastic-certs +# secretName: elastic-certs +# path: /ssl es: ## Address (host and port) of the Elasticsearch node we should connect to. @@ -121,7 +115,7 @@ es: # pem: # Path of ca pem file which should match a secretMount path - # pemPath: /ssl/ca.pem + # path: /ssl/ca.pem client: ## PEM that contains the client cert to connect to Elasticsearch.