Merge branch 'master' into patch-1

upmc-enterprises · Apr 26, 2018 · dfde444 · dfde444
2 parents 42df52a + 5ad47a5
commit dfde444
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ Following parameters are available to customize the elastic cluster:
 
 The default image used adds TLS to the Elastic cluster. If not existing, secrets are automatically generated by the operator dynamically. 
 
-If supplying your own certs, first generate them and add to a secret. Secret should contain `truststore.jks` and `node-keystore.jks`. The name of the secret should follow the pattern: `es-certs-[ClusterName]`. So for example if your cluster is named `example-es-cluster` then the secret should be `es-certs-example-es-cluster. 
+If supplying your own certs, first generate them and add to a secret. Secret should contain `truststore.jks` and `node-keystore.jks`. The name of the secret should follow the pattern: `es-certs-[ClusterName]`. So for example if your cluster is named `example-es-cluster` then the secret should be `es-certs-example-es-cluster`. 
 
 ## Base image
 
@@ -107,6 +107,8 @@ _NOTE: In the example we're putting the operator into the namespace `operator`.
 
 # Create Example ElasticSearch Cluster
 
+Run the following command to create a [sample cluster](example/example-es-cluster.yaml) on AWS and you most likely will have to update the [zones](example/example-es-cluster.yaml#L16) to match your AWS Account, other examples are available as well if not running on AWS: 
+
 ```bash
 $ kubectl create -n operator -f https://raw.githubusercontent.com/upmc-enterprises/elasticsearch-operator/master/example/example-es-cluster.yaml
 ```

diff --git a/charts/elasticsearch-0.1.3.tgz b/charts/elasticsearch-0.1.3.tgz
diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Elasticsearch cluster
 name: elasticsearch
-version: 0.1.2
+version: 0.1.3
 sources:
 - https://github.com/upmc-enterprises/elasticsearch-operator
 maintainers:

diff --git a/charts/elasticsearch/templates/cluster.yaml b/charts/elasticsearch/templates/cluster.yaml
@@ -42,10 +42,13 @@ spec:
      username: {{ .Values.snapshot.authentication.username }}
 {{- end }}
   storage:
+{{- if .Values.storage.class }}
+    storage-class: {{ .Values.storage.class }}
+{{- else }}
     type: {{ .Values.storage.type }}
     storage-class-provisioner: {{ .Values.storage.classProvisioner }}
     volume-reclaim-policy: {{ .Values.storage.reclaimPolicy }}
-    storage-class-provisioner: kubernetes.io/aws-ebs
+{{- end }}
 {{- if .Values.statsd.enabled }}
   statsd-host: {{ .Values.statsd.host }}
 {{- end }}

diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
@@ -28,6 +28,8 @@ snapshot:
     username: test
 
 storage:
+# If class is set, then the other storage fields will not be used.
+#  class: local-storage
   # e.g. gp2 for AWS
   type: gp2
   # e.g. kubernetes.io/aws-ebs for AWS

diff --git a/charts/index.yaml b/charts/index.yaml
@@ -2,7 +2,21 @@ apiVersion: v1
 entries:
   elasticsearch:
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.906577+01:00
+    created: 2018-04-05T10:18:09.843410146-06:00
+    description: A Helm chart for Elasticsearch cluster
+    digest: 2dee389105b87cfaf0150f4215f927bcb79c22f877e801850419a17284191343
+    maintainers:
+    - email: [email protected]
+      name: komljen
+      url: https://akomljen.com
+    name: elasticsearch
+    sources:
+    - https://github.com/upmc-enterprises/elasticsearch-operator
+    urls:
+    - elasticsearch-0.1.3.tgz
+    version: 0.1.3
+  - apiVersion: v1
+    created: 2018-04-05T10:18:09.843131675-06:00
     description: A Helm chart for Elasticsearch cluster
     digest: 398bcb148fe08fe7ae0d5918af25efd28fe60fd77f47ae2760f1347643d76aab
     maintainers:
@@ -16,7 +30,7 @@ entries:
     - elasticsearch-0.1.2.tgz
     version: 0.1.2
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.905508+01:00
+    created: 2018-04-05T10:18:09.842617843-06:00
     description: A Helm chart for Elasticsearch cluster
     digest: de2209bffb7a05c436354b2514abadacb83007dd0d59941cb78b340c6db9cc52
     maintainers:
@@ -30,7 +44,7 @@ entries:
     - elasticsearch-0.1.1.tgz
     version: 0.1.1
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.904722+01:00
+    created: 2018-04-05T10:18:09.842079783-06:00
     description: A Helm chart for Elasticsearch cluster
     digest: 37bc0b51a58e73e29221062df665ce7234f36689dc7051164141680b6c0096bd
     maintainers:
@@ -44,7 +58,7 @@ entries:
     version: 0.1.0
   elasticsearch-operator:
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.909563+01:00
+    created: 2018-04-05T10:18:09.845096553-06:00
     description: A Helm chart for Elasticsearch operator
     digest: bf9e1bf0f857acdbb281ac2480add1f5a9d33b303e3cba4fffdc6921cbf27f5f
     maintainers:
@@ -58,7 +72,7 @@ entries:
     - elasticsearch-operator-0.1.2.tgz
     version: 0.1.2
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.908184+01:00
+    created: 2018-04-05T10:18:09.844405824-06:00
     description: A Helm chart for Elasticsearch operator
     digest: 65b48cf707f5bd8170a22f4827236c36591dde215712b29a8df0136e64d57a49
     maintainers:
@@ -72,7 +86,7 @@ entries:
     - elasticsearch-operator-0.1.1.tgz
     version: 0.1.1
   - apiVersion: v1
-    created: 2018-03-21T10:27:39.907372+01:00
+    created: 2018-04-05T10:18:09.843902433-06:00
     description: A Helm chart for Elasticsearch operator
     digest: 1c21e32521c3843f04e38892ea432a2529d819019f7bb919cc48bedf9a629400
     maintainers:
@@ -84,4 +98,4 @@ entries:
     urls:
     - elasticsearch-operator-0.1.0.tgz
     version: 0.1.0
-generated: 2018-03-21T10:27:39.903341+01:00
+generated: 2018-04-05T10:18:09.841402966-06:00