rename helm variable 'elasticsearch.securityContext' to 'elasticsearc…

…h.securityContextCustom'
opendistro-for-elasticsearch · Mar 19, 2021 · 0203370 · 0203370
1 parent 88f021d
commit 0203370
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/helm/README.md b/helm/README.md
@@ -524,7 +524,7 @@ The following table lists the configurable parameters of the opendistro elastics
 | `elasticsearch.securityConfig.rolesSecret`                | Name of secret with [roles.yml](https://github.com/opendistro-for-elasticsearch/security/blob/master/securityconfig/roles.yml) defined                   | `""`                                                                    |
 | `elasticsearch.securityConfig.rolesMappingSecret`         | Name of secret with [roles_mapping.yml](https://github.com/opendistro-for-elasticsearch/security/blob/master/securityconfig/roles_mapping.yml) defined   | `""`                                                                    |
 | `elasticsearch.securityConfig.tenantsSecret`              | Name of secret with [tenants.yml](https://github.com/opendistro-for-elasticsearch/security/blob/master/securityconfig/tenants.yml) defined               | `""`                                                                    |
-| `elasticsearch.securityContext`                           | securityContext for the ElasticSearch pods                                                                                                               | `{}`                                                                    |
+| `elasticsearch.securityContextCustom`                     | securityContext for the ElasticSearch pods                                                                                                               | `{}`                                                                    |
 | `elasticsearch.ssl.transport.existingCertSecret`          | Name of secret that contains the transport certs                                                                                                         | `""`                                                                    |
 | `elasticsearch.ssl.transport.existingCertSecretCertSubPath`  | Subpath of elastic transport cert secret                                                                                                              | `"elk-transport-crt.pem"`                                               |
 | `elasticsearch.ssl.transport.existingCertSecretKeySubPath`   | Subpath of elastic transport key secret                                                                                                               | `"elk-transport-key.pem"`                                               |

diff --git a/helm/opendistro-es/templates/elasticsearch/es-client-deploy.yaml b/helm/opendistro-es/templates/elasticsearch/es-client-deploy.yaml
@@ -70,7 +70,7 @@ spec:
 {{- if .Values.elasticsearch.extraInitContainers }}
 {{ toYaml .Values.elasticsearch.extraInitContainers| indent 6 }}
 {{- end }}
-{{- with .Values.elasticsearch.securityContext }}
+{{- with .Values.elasticsearch.securityContextCustom }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}

diff --git a/helm/opendistro-es/templates/elasticsearch/es-data-sts.yaml b/helm/opendistro-es/templates/elasticsearch/es-data-sts.yaml
@@ -82,7 +82,7 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}
       serviceAccountName: {{ template "opendistro-es.elasticsearch.serviceAccountName" . }}
-{{- with .Values.elasticsearch.securityContext }}
+{{- with .Values.elasticsearch.securityContextCustom }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}

diff --git a/helm/opendistro-es/templates/elasticsearch/es-master-sts.yaml b/helm/opendistro-es/templates/elasticsearch/es-master-sts.yaml
@@ -85,7 +85,7 @@ spec:
 {{- if .Values.elasticsearch.master.extraInitContainers }}
 {{ toYaml .Values.elasticsearch.master.extraInitContainers| indent 6 }}
 {{- end }}
-{{- with .Values.elasticsearch.securityContext }}
+{{- with .Values.elasticsearch.securityContextCustom }}
       securityContext:
 {{ toYaml . | indent 8 }}
 {{- end }}

diff --git a/helm/opendistro-es/values-nonroot.yaml b/helm/opendistro-es/values-nonroot.yaml
@@ -184,7 +184,7 @@ elasticsearch:
 
 
   ## securityContext to apply to the pod. Allows for running as non-root
-  securityContext:
+  securityContextCustom:
     fsGroup: 1000
     runAsUser: 1000
     runAsGroup: 1000

diff --git a/helm/opendistro-es/values.yaml b/helm/opendistro-es/values.yaml
@@ -182,7 +182,7 @@ elasticsearch:
 
 
   ## securityContext to apply to the pod. Allows for running as non-root
-  securityContext: {}
+  securityContextCustom: {}
   #  fsGroup: 1000
   #  runAsUser: 1000
   #  runAsGroup: 1000