From 8edcecacc8b6c12bf27a82992d03094f51eb62b6 Mon Sep 17 00:00:00 2001 From: ethan wolf Date: Fri, 30 Mar 2018 13:35:20 -0600 Subject: [PATCH 1/4] Add ability to use an existing storage-class as in for persistent volume claims (as in https://github.com/upmc-enterprises/elasticsearch-operator/blob/5e7bc87b4a6a77da0f1c70697df88b21edfe1531/example/example-es-cluster-hostpath.yaml) --- charts/elasticsearch/templates/cluster.yaml | 5 ++++- charts/elasticsearch/values.yaml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/elasticsearch/templates/cluster.yaml b/charts/elasticsearch/templates/cluster.yaml index d57f9f769..21cc9454b 100644 --- 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 index 18108c992..984666662 100644 --- 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 From b13d3bed2cb0eac8668b2a55d60d829c0bacde33 Mon Sep 17 00:00:00 2001 From: Christian Budde Christensen Date: Wed, 4 Apr 2018 13:16:37 +0200 Subject: [PATCH 2/4] fix README formatting --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 48755a7d7..9ca101f50 100644 --- 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 @@ -246,7 +246,7 @@ spec: # Access Cluster -Once deployed and all pods are running, the cluster can be accessed internally via https://elasticsearch:9200/ or https://${ELASTICSEARCH_SERVICE_HOST}:9200/ +Once deployed and all pods are running, the cluster can be accessed internally via `https://elasticsearch:9200/` or `https://${ELASTICSEARCH_SERVICE_HOST}:9200/` ![alt text](docs/images/running-cluster.png "Running Cluster") From 2189cdb4e70dfb9fc424a33c492e302e200dfb38 Mon Sep 17 00:00:00 2001 From: ethan wolf Date: Thu, 5 Apr 2018 10:20:32 -0600 Subject: [PATCH 3/4] Up the elastic search chart version (support for storage-class) --- charts/elasticsearch-0.1.3.tgz | Bin 0 -> 1993 bytes charts/elasticsearch/Chart.yaml | 2 +- charts/index.yaml | 28 +++++++++++++++++++++------- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 charts/elasticsearch-0.1.3.tgz diff --git a/charts/elasticsearch-0.1.3.tgz b/charts/elasticsearch-0.1.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..6a2243d5543090d1ca0db01046c9ebea9110181a GIT binary patch literal 1993 zcmV;)2R8U0iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI=ejvKcT&Tl@&RM#NMHA}5@r*peNfEag18?>9yBzL9VwS1Q#7rRY02S_XK%#a+;3}?PW!K~xCMP~AHd|5K%=!R9| zlY68zP16UnS@=%VboiZ~r{}xpFg`iExR`wc_qm4mQf(bGpQP!p)id1O{|GV7pQEu{ z$qd#LQlQNZ*Dm~i2!BISLGGOb7Rtb*uCqWcYU|LDigD=}muPH862OXakpUAZ=}J}N zCCaY_Un9*`MF1qLFoWg=0jQ10pma{#Y&>Soc;JnkJqIOL)h5Rr{f)%t-8}PCqRe=^*Zj`m~T1m9z zBz$G$1R#OhCdjNyCi&oZG5C#ySjn_4mGj0z>Frx&uwcR>0hrhM3f<#g)@=B_d2C){ zQ47pq^fj*0Y+zcA2mq^HiPG_$g{)5i4(Nt(fH%q%jV=99ZPCOe9nEWe;?@3WX214abB#nSSS3tU?u+-Dw zs}H}w_GiD*nEA0i!`?S2S7UZ#6P(+QNKpUOs5SR@0h$cf;g~5Cx@5F3-b|kap)kiY z^miU816L@}VQ}AEFkU@Xg6Es89VaV3XObN}vgr8`eVaCiMsqceGR;?_tj&UB6OyCB zxly-i8%9nmlF|$MXMak}+2WvrQdyV5Xhev?-A(KF^;3=3+2|V;Rv|!Vlj*lSjO4n` zV3wx-dKbLnL(WM$J@2x9Hu>!T`p*4tqW=BAOUmQNPriF}P2DSZ4|CjA|DR1KgZqDW zcC7zD3|$&zj?3lY+MZHM$Yr=S0cD{TmoD7sEYH!}c#}80832KOS>C^>-@F0(3j0F|qtIdSCp%C{buMmOA~bTY)>`f0CXL>;H@C z>=^$agx{2YES7Ur0<+9Ft0A^d$; z2gY4D6|3)YLal>^&xg+UMW4?%!6H|WuRX8Ns#atE#hu3SOY9ryk72IttDkSFR#F=- z-2z6R+T>F^8sy2S_Lms-WBcckep`B9{%;F_`+$P($p2^OXAg$?|7>!8%>N&Py7+IW zX{5f144CSALRMTBS-(KMY_VT-tY9v5w|CcO0D{d?H0>eNI#D zzmp5M+hjk|>;&F|K`mI0F#6L7MlVLK4igu4aFxX8>MSHbzS!m1*n!igRgQZ04gId? z_WJq~;RSTEY4h08-8ANX<(&rqkoH#Qka}ogpQNd}8}U&`J`B-4&<5LW_Red^mayH9 z0!ZR(|3s<+6SG6by6fpdYH<}2RJ%o}kGe%6??tzWbYZzDAkp0@vq~apk<#!tG;sjh zB7cLqd52R!vPuki-U63}?{m&~RuvYzqVUgu^{pM296_VR25@k&;5}{_1zxf>OH}yp zN`H4Ppm@MZ;)(3B%%~}hCVn)rVYrE@q!Wd=DCljY3o7nmLX+&^p^mbax9_tp_L#gg z`Hp`NPVVB_D4BFX$wN}@>)?$8!|a&)0OoLIhv3Z)n0aW{fx?!#)!4y3e};6+{I1zs zv~;+yI8Gye+RWL*AN%tT+54{BLZb&H{ELJ76Wv8c-#1qWI&HNyvC!b4iEe<<0~&fz z>FrrE;+6eljblyd_tXboKmLxrJCNqPIbip4kOw~Y_57Ptzy6~oii$6#GI)=3+=c(m zCbQxH|I!D?{{Mr}2|Q)ap^*XBi$@PPB}$mrTok^C)hu7JCEDHp|7@+bGR}f6Q3zNH zHHV71yySBErLVD=<7))XT-h0CvLGiQaT)R=e69^H_$w^nhPx8}@CAh@QfxrUAnBI` z8Vv|8krH}!{o>jwgX9D*RaGeo&o8f`;KmZV Date: Thu, 26 Apr 2018 15:22:21 -0400 Subject: [PATCH 4/4] Update readme with zones Signed-off-by: Steve Sloka --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9ca101f50..003c4c112 100644 --- a/README.md +++ b/README.md @@ -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 ```