elastic · pebrc · Oct 2, 2019 · Oct 2, 2019 · Oct 2, 2019 · Oct 2, 2019
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -8,35 +8,6 @@ Third party libraries used by the Elastic Cloud on Kubernetes project
 ================================================================================
 
 
---------------------------------------------------------------------------------
-Module  : github.com/Masterminds/sprig
-Version : v2.20.0+incompatible
-Time    : 2019-06-18 15:54:40 +0000 UTC
-
-Contents of probable licence file $GOMODCACHE/github.com/!masterminds/sprig@v2.20.0+incompatible/LICENSE.txt:
-
-Sprig
-Copyright (C) 2013 Masterminds
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
 --------------------------------------------------------------------------------
 Module  : github.com/davecgh/go-spew
 Version : v1.1.1

diff --git a/config/crds/apm.k8s.elastic.co_apmservers.yaml b/config/crds/apm.k8s.elastic.co_apmservers.yaml
diff --git a/config/crds/kibana.k8s.elastic.co_kibanas.yaml b/config/crds/kibana.k8s.elastic.co_kibanas.yaml
diff --git a/config/samples/apm/apm_es_kibana.yaml b/config/samples/apm/apm_es_kibana.yaml
@@ -6,17 +6,17 @@ metadata:
   name: es-apm-sample
 spec:
   version: 7.4.0
-  nodes:
+  nodeSets:
   - name: default
-    nodeCount: 3
+    count: 3
 ---
 apiVersion: apm.k8s.elastic.co/v1beta1
 kind: ApmServer
 metadata:
   name: apm-apm-sample
 spec:
   version: 7.4.0
-  nodeCount: 1
+  count: 1
   elasticsearchRef:
     name: "es-apm-sample"
 ---
@@ -26,6 +26,6 @@ metadata:
   name: kb-apm-sample
 spec:
   version: 7.4.0
-  nodeCount: 1
+  count: 1
   elasticsearchRef:
     name: "es-apm-sample"
diff --git a/config/samples/apm/apmserver.yaml b/config/samples/apm/apmserver.yaml
@@ -4,7 +4,7 @@ metadata:
   name: apmserver-sample
 spec:
   version: 7.4.0
-  nodeCount: 1
+  count: 1
   config:
     output.console:
       pretty: true

diff --git a/config/samples/elasticsearch/elasticsearch.yaml b/config/samples/elasticsearch/elasticsearch.yaml
@@ -5,7 +5,7 @@ metadata:
   name: elasticsearch-sample
 spec:
   version: 7.4.0
-  nodes:
+  nodeSets:
   - name: default
     config:
       # most Elasticsearch configuration parameters are possible to set, e.g:
@@ -30,7 +30,7 @@ spec:
           env:
           - name: ES_JAVA_OPTS
             value: "-Xms2g -Xmx2g"
-    nodeCount: 3
+    count: 3
   #   # request 2Gi of persistent data storage for pods in this topology element
   #   volumeClaimTemplates:
   #   - metadata:

diff --git a/config/samples/kibana/kibana.yaml b/config/samples/kibana/kibana.yaml
@@ -5,16 +5,24 @@ metadata:
   name: kibana-sample
 spec:
   version: 7.4.0
-  elasticsearch:
-    url: https://url.to.elasticsearch:9200
-    auth:
-      # reference to a secret containing credentials in the given key
-      secret:
-        name: secret-name
-        key: user # key is the user, value is the password for that user
-    certificateAuthorities:
-      secretName: my-ca-cert # reference to a secret containing certificates under "tls.crt"
-  nodeCount: 1
+  config:
+    elasticsearch.hosts:
+    - https://url.to.elasticsearch:9200
+    elasticsearch.username: my-kibana-user
+    elasticsearch.password: $PASSWORD
+    elasticsearch.ssl.certificateAuthorities: /mnt/certs/elasticsearch/ca.crt
+  count: 1
+  podTemplate:
+    spec:
+      containers:
+      - name: kibana
+        volumeMounts:
+        - name: certs
+          mountPath: /mnt/certs/elasticsearch
+      volumes:
+      - name: certs
+        secret:
+          secretName: my-es-http-certs
 #   http:
 #     service:
 #       spec:

diff --git a/config/samples/kibana/kibana_es.yaml b/config/samples/kibana/kibana_es.yaml
@@ -5,17 +5,17 @@ metadata:
   name: elasticsearch-sample
 spec:
   version: 7.4.0
-  nodes:
+  nodeSets:
   - name: default
-    nodeCount: 1
+    count: 1
 ---
 apiVersion: kibana.k8s.elastic.co/v1beta1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
   version: 7.4.0
-  nodeCount: 1
+  count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
   #http:

diff --git a/docs/advanced-node-scheduling.asciidoc b/docs/advanced-node-scheduling.asciidoc
@@ -25,16 +25,18 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
+  nodeSets:
   # 3 dedicated master nodes
-  - nodeCount: 3
+  - name: master
+    count: 3
     config:
       node.master: true
       node.data: false
       node.ingest: false
       cluster.remote.connect: false
   # 3 ingest-data nodes
-  - nodeCount: 3
+  - name: ingest-data
+    count: 3
     config:
       node.master: false
       node.data: true
@@ -60,8 +62,8 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodesSets:
+  - count: 3
     podTemplate:
       spec:
         affinity:
@@ -87,8 +89,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
     podTemplate:
       spec:
         affinity: {}
@@ -104,8 +107,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
     podTemplate:
       spec:
         affinity:
@@ -149,8 +153,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
     podTemplate:
       spec:
         nodeSelector:
@@ -168,8 +173,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
     podTemplate:
       spec:
         affinity:
@@ -208,8 +214,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 1
+  nodeSets:
+  - name: group-a
+    count: 1
     config:
       node.attr.zone: europe-west3-a
       cluster.routing.allocation.awareness.attributes: zone
@@ -227,7 +234,8 @@ spec:
                   operator: In
                   values:
                   - europe-west3-a
-  - nodeCount: 1
+  - name: group-b
+    count: 1
     config:
       node.attr.zone: europe-west3-b
       cluster.routing.allocation.awareness.attributes: zone
@@ -276,9 +284,10 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
+  nodeSets:
   # hot nodes, with high CPU and fast IO
-  - nodeCount: 3
+  - name: hot
+    count: 3
     config:
       node.attr.data: hot
     podTemplate:
@@ -309,7 +318,8 @@ spec:
             storage: 1Ti
         storageClassName: local-storage
   # warm nodes, with high storage
-  - nodeCount: 3
+  - name: warm
+    count: 3
     config:
       node.attr.data: warm
     podTemplate:

diff --git a/docs/apm.asciidoc b/docs/apm.asciidoc
@@ -33,7 +33,7 @@ metadata:
   namespace: default
 spec:
   version: {version}
-  nodeCount: 1
+  count: 1
   elasticsearchRef:
     name: quickstart
 EOF
@@ -87,7 +87,7 @@ metadata:
   namespace: default
 spec:
   version: {version}
-  nodeCount: 1
+  count: 1
   config:
     output:
       elasticsearch:
@@ -122,7 +122,7 @@ metadata:
   namespace: default
 spec:
   version: {version}
-  nodeCount: 1
+  count: 1
   secureSettings:
   - secretName: apm-secret-settings
   config:
@@ -161,7 +161,7 @@ metadata:
   namespace: default
 spec:
   version: {version}
-  nodeCount: 1
+  count: 1
   secureSettings:
   - secretName: apm-secret-settings
   config:

diff --git a/docs/elasticsearch-spec.asciidoc b/docs/elasticsearch-spec.asciidoc
@@ -292,7 +292,7 @@ But you can use the same approach for any kind of file you want to mount into th
 [source,yaml]
 ----
 spec:
-  nodes:
+  nodeSets:
   - podTemplate:
       spec:
         containers:
@@ -411,8 +411,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
   podDisruptionBudget:
     spec:
       maxUnavailable: 2
@@ -431,8 +432,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
   podDisruptionBudget: {}
 ----
 

diff --git a/docs/k8s-quickstart.asciidoc b/docs/k8s-quickstart.asciidoc
@@ -55,8 +55,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 1
+  nodeSets:
+  - name: default
+    count: 1
     config:
       node.master: true
       node.data: true
@@ -182,7 +183,7 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodeCount: 1
+  count: 1
   elasticsearchRef:
     name: quickstart
 EOF
@@ -247,7 +248,8 @@ metadata:
 spec:
   version: {version}
   nodes:
-  - nodeCount: 3
+  - name: default
+    count: 3
     config:
       node.master: true
       node.data: true
@@ -272,8 +274,9 @@ metadata:
   name: quickstart
 spec:
   version: {version}
-  nodes:
-  - nodeCount: 3
+  nodeSets:
+  - name: default
+    count: 3
     config:
       node.master: true
       node.data: true