ES deprectaed discovery plugin

Reviewers: juan, tomas Reviewed By: juan, tomas Maniphest Tasks: T26128 Differential Revision: http://phabricator.bitnami.com:8080/D27388
bitnami · Jun 12, 2018 · 25752a0 · 25752a0
1 parent 2b2d2d7
commit 25752a0
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 92 deletions.
diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml
@@ -1,5 +1,5 @@
 name: elasticsearch
-version: 0.1.7
+version: 1.0.0
 appVersion: 6.2.4
 description: A highly scalable open-source full-text search and analytics engine
 keywords:

diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md
@@ -54,10 +54,7 @@ The following table lists the configurable parameters of the Elasticsearch chart
 | `image.tag`                                       | Elasticsearch image tag                                                                                                   | `{VERSION}`                                                         |
 | `image.pullPolicy`                                | Image pull policy                                                                                                         | `Always`                                                            |
 | `image.pullSecrets`                               | Specify image pull secrets                                                                                                | `nil`                                                               |
-| `rbacEnabled`                                     | `Specify if rbac is enabled in your cluster`                                                                              | `false`                                                             |
 | `name`                                            | Elasticsearch cluster name                                                                                                | `elastic`                                                           |
-| `serviceAccountName`                              | Service account for Elasticsearch release                                                                                 | `elastic`                                                           |
-| `plugins`                                         | Elasticsearch node plugins                                                                                                | `io.fabric8:elasticsearch-cloud-kubernetes:6.2.3` (required plugin) |
 | `config`                                          | Elasticsearch node custom configuration                                                                                   | ``                                                                  |
 | `master.name`                                     | Master-eligible node pod name                                                                                             | `master`                                                            |
 | `master.replicas`                                 | Desired number of Elasticsearch master-eligible nodes                                                                     | `2`                                                                 |
@@ -76,7 +73,8 @@ The following table lists the configurable parameters of the Elasticsearch chart
 | `master.readinessProbe.timeoutSeconds`            | When the probe times out (master-eligible nodes pod)                                                                      | `5`                                                                 |
 | `master.readinessProbe.successThreshold`          | Minimum consecutive successes for the probe to be considered successful after having failed (master-eligible nodes pod)   | `1`                                                                 |
 | `master.readinessProbe.failureThreshold`          | Minimum consecutive failures for the probe to be considered failed after having succeeded                                 | `5`                                                                 |
-| `coordinating.name`                               | Coordinating-only node pod name                                                                                           | `coordinating`                                                      |
+| `discovery.name`                                  | Discover node pod name                                                                                                    | `discovery`                                                         |
+| `coordinating.name`                               | Coordinating-only node pod name                                                                                           | `coordinating-only`                                                      |
 | `coordinating.replicas`                           | Desired number of Elasticsearch coordinating-only nodes                                                                   | `2`                                                                 |
 | `coordinating.heapSize`                           | Coordinating-only node heap size                                                                                          | `128m`                                                              |
 | `coordinating.antiAffinity`                       | Coordinating-only node pod anti-affinity policy                                                                           | `soft`                                                              |

diff --git a/bitnami/elasticsearch/templates/_helpers.tpl b/bitnami/elasticsearch/templates/_helpers.tpl
@@ -49,6 +49,15 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s-%s" .Release.Name $name .Values.ingest.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create a default fully qualified discovery name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "discovery.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s-%s" .Release.Name $name .Values.discovery.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified coordinating name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

diff --git a/bitnami/elasticsearch/templates/cm.yaml b/bitnami/elasticsearch/templates/cm.yaml
@@ -17,12 +17,9 @@ data:
 
     discovery:
       zen:
-        hosts_provider: kubernetes
+        ping.unicast.hosts:{{ template "discovery.fullname" . }}
         minimum_master_nodes: 2
 
-    plugin:
-      mandatory: discovery-kubernetes
-
 {{- if .Values.config }}
 {{ toYaml .Values.config | indent 4 }}
 {{- end }}
diff --git a/bitnami/elasticsearch/templates/coordinating-deploy.yaml b/bitnami/elasticsearch/templates/coordinating-deploy.yaml
@@ -17,9 +17,6 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "coordinating-only"
     spec:
-      {{- if .Values.rbacEnabled}}
-      serviceAccountName: {{ .Values.serviceAccountName | quote }}
-      {{- end }}
       {{- if eq .Values.coordinating.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:

diff --git a/bitnami/elasticsearch/templates/data-statefulset.yaml b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -23,9 +23,6 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "data"
     spec:
-      {{- if .Values.rbacEnabled}}
-      serviceAccountName: {{ .Values.serviceAccountName | quote }}
-      {{- end }}
       {{- if eq .Values.data.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:

diff --git a/bitnami/elasticsearch/templates/discovery-svc.yaml b/bitnami/elasticsearch/templates/discovery-svc.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+  name: {{ template "discovery.fullname" . }}
+  labels:
+    app: {{ template "elasticsearch.name" . }}
+    chart: {{ template "elasticsearch.chart" . |}}
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+spec:
+  clusterIP: None
+  ports:
+  - port: 9300
+    name: transport
+    targetPort: transport
+  publishNotReadyAddresses: true
+  sessionAffinity: None
+  type: ClusterIP
+  selector:
+    app: {{ template "elasticsearch.name" . }}
+    release: {{ .Release.Name | quote }}
diff --git a/bitnami/elasticsearch/templates/ingest-deploy.yaml b/bitnami/elasticsearch/templates/ingest-deploy.yaml
@@ -18,9 +18,6 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "ingest"
     spec:
-      {{- if .Values.rbacEnabled}}
-      serviceAccountName: {{ .Values.serviceAccountName | quote }}
-      {{- end }}
       {{- if eq .Values.ingest.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:

diff --git a/bitnami/elasticsearch/templates/master-deploy.yaml b/bitnami/elasticsearch/templates/master-deploy.yaml
@@ -17,9 +17,6 @@ spec:
         release: {{ .Release.Name | quote }}
         role: "master"
     spec:
-      {{- if .Values.rbacEnabled}}
-      serviceAccountName: {{ .Values.serviceAccountName | quote }}
-      {{- end }}
       {{- if eq .Values.master.antiAffinity "hard" }}
       affinity:
         podAntiAffinity:

diff --git a/bitnami/elasticsearch/templates/role.yaml b/bitnami/elasticsearch/templates/role.yaml
diff --git a/bitnami/elasticsearch/templates/rolebinding.yaml b/bitnami/elasticsearch/templates/rolebinding.yaml
diff --git a/bitnami/elasticsearch/templates/serviceaccount.yaml b/bitnami/elasticsearch/templates/serviceaccount.yaml
diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml
@@ -17,23 +17,10 @@ image:
   # pullSecrets:
   #   - myRegistrKeySecretName
 
-## does your cluster have rbac enabled? assume yes by default
-rbacEnabled: true
-
 ## Elasticsearch cluster name
 ##
 name: elastic
 
-## The serviceAccountName to be used, required by the elasticsearch-cloud-kubernetes plugin
-## ref: https://github.com/fabric8io/elasticsearch-cloud-kubernetes#kubernetes-auth
-##
-serviceAccountName: elastic
-
-## Comma seperated list of plugins
-## ref: https://github.com/bitnami/bitnami-docker-elasticsearch#environment-variables
-##
-plugins: io.fabric8:elasticsearch-cloud-kubernetes:6.2.3.2
-
 ## Customize elasticsearch configuration
 ## ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
 ##
@@ -70,6 +57,11 @@ master:
     successThreshold: 1
     failureThreshold: 5
 
+## Elasticsearch discovery node parameters
+##
+discovery:
+  name: discovery
+
 ## Elasticsearch coordinating-only node parameters
 ##
 coordinating:

diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml
@@ -17,23 +17,10 @@ image:
   # pullSecrets:
   #   - myRegistrKeySecretName
 
-## does your cluster have rbac enabled? assume yes by default
-rbacEnabled: true
-
 ## Elasticsearch cluster name
 ##
 name: elastic
 
-## The serviceAccountName to be used, required by the elasticsearch-cloud-kubernetes plugin
-## ref: https://github.com/fabric8io/elasticsearch-cloud-kubernetes#kubernetes-auth
-##
-serviceAccountName: elastic
-
-## Comma seperated list of plugins
-## ref: https://github.com/bitnami/bitnami-docker-elasticsearch#environment-variables
-##
-plugins: io.fabric8:elasticsearch-cloud-kubernetes:6.2.3.2
-
 ## Customize elasticsearch configuration
 ## ref: https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html
 ##
@@ -70,6 +57,11 @@ master:
   #  successThreshold: 1
   #  failureThreshold: 5
 
+## Elasticsearch discovery node parameters
+##
+discovery:
+  name: discovery
+
 ## Elasticsearch coordinating-only node parameters
 ##
 coordinating: