From f48f6f217e3978bb5dc0c0231749211ea7e9114e Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Tue, 30 Jul 2019 15:11:36 +0100 Subject: [PATCH 1/9] Enable nodeSelector for elasticsearch-operator itself This is needed to stop it trying to spin up on windows nodes in mixed cluster scenarios. --- charts/elasticsearch-operator/templates/deployment.yaml | 4 ++++ charts/elasticsearch-operator/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/charts/elasticsearch-operator/templates/deployment.yaml b/charts/elasticsearch-operator/templates/deployment.yaml index 725012f2b..22f07cae0 100644 --- a/charts/elasticsearch-operator/templates/deployment.yaml +++ b/charts/elasticsearch-operator/templates/deployment.yaml @@ -40,6 +40,10 @@ spec: timeoutSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} +{{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 8 }} +{{- end }} {{- if .Values.image.pullSecret }} imagePullSecrets: - name: {{ .Values.image.pullSecret }} diff --git a/charts/elasticsearch-operator/values.yaml b/charts/elasticsearch-operator/values.yaml index 94bf8bc32..cab45e444 100644 --- a/charts/elasticsearch-operator/values.yaml +++ b/charts/elasticsearch-operator/values.yaml @@ -15,3 +15,5 @@ resources: memory: 128Mi rbac: enabled: false +nodeSelector: + beta.kubernetes.io/os: linux From c6ea7521ccd60874e11586332ee32caed4ab04cf Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Tue, 30 Jul 2019 15:21:38 +0100 Subject: [PATCH 2/9] Bumping elasticsearch-operator chart to 0.1.4 Includes nodeSelector support --- charts/elasticsearch-operator-0.1.4.tgz | Bin 0 -> 1890 bytes charts/elasticsearch-operator/Chart.yaml | 2 +- charts/index.yaml | 38 ++++++++++++++++------- 3 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 charts/elasticsearch-operator-0.1.4.tgz diff --git a/charts/elasticsearch-operator-0.1.4.tgz b/charts/elasticsearch-operator-0.1.4.tgz new file mode 100644 index 0000000000000000000000000000000000000000..aceb561b6d7446d27f35960c42f67ed5d9873aa9 GIT binary patch literal 1890 zcmV-o2c7sIiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PGoSZ{x<%pZP1MaswppiK1jnJ`e~{*LKsQy^C=wt_XtQuq21l zp7)jArEJBg{`O**6iGdNa%|UWaGDPixjQ>EJ3G%MGGZ)E4HBJByHcShR_fmQlxQ2y z31~_wN{z9*CW-q$1O3pTWDZpp;Pn>my0LV zPK(4X?G=irT@)6z($t{o-9u%z+Cc+9}P~|{D0Js zqP_pW1RTNz=A>X2$|LuFzTGIo;1K>br3R=00zaI+`DZtmniFd=gPbyS2p5<#q7i09 zQ<5+=U?n67iWq|#P+=v^Wud_$SBzLRVL&;VU>pEwRMJo@^*jdW!4Gg?081v$eWS2H z2mn;U*p*~7oyTy-ZphpOhvn!PQ;jwbG}fU5fKg7Ze*#EV5ko(UxPRlwy&V0)>o?TP z_H%*eA-Fmrsl!6y6p+P`6J{_FGQ%-4Os&*zIzdaq>mord(5ZpSo-{EqDvH~e3q<$$ ze|;_2Mc}Z4%UeZ626l=*hl9-hvo8O!P2I`)s0kBdB~x6tV}#871ZxfJ(YBe4ji=8+eS&Ee;QFq%`$ zfGFiR5(fXqlDfyYj)&Wnfdo@h7z86Z!ar(PEw`UjWSIdM?0gi#%!NAZ0_4}p+^go| z?bzW`F#)46{pR6XaW`jj{O!Y4wp^(+6*h;?SEl=w=|K1n84`o#%98A_(e7_; zv3qz<*ctybR7}n}ipRHuJL3P~bab*F|4&E9`}qG7(C+{6)}nBarZ?-m@}wVJQ<24R zQQJVk(UOc<64#yF-CbSF?FjlIEEcZjA_=mpjv`7uf&!FD$FFRM!NsE6j8xl#Pp+(F zBt_`_sRNx4oh1!j#=(-xN>E%Z0vE5Vl9bVum>Bx5)~v*gtFo`rg@g9S96VA#C45#o zhp?2;t3x&ocsbH-xUXucW>8k$&~X@5`tUhsEtT>D_1vP>@on6wpq3JL zfsD+@m`ag3`)gxZ%25_}+oVR4(O)f?TQ&b*NH%NYB%} z>Kq$}2K9`lc$TKJ5cch3;!2BUJO1y?|6ZV{-2?5&|0n&E6{hDqJAeCelfbz1uL)S ziK5?WStt|3kDaEz?EDn8^8x(WY1$0ac?F$i*@fk6MvzP4-`vU>>cp=~eUI-jCTQJX zp|WZqLx$xOqsDfAS{H^W+Q?I#+@@G*VXWlKA>Xu9TkqgG@->`iSkdt-^kykNDV zx7=Wb$!hfhOPaJNhC?F{)bMYJ$Nw3KSP5u4X6v|(pfSDp= zFkvzQ?y?>glUFWg5=&?3Zx&kPL}bAs2%PwM2VX0VIlaXUZm6BYAHE6Ud%@-)g2;y}w=WYMh2};DM`1#)gQL)L6&(F1IE42^Q&|}J`^BXRLZzjPtU*XKB)t+( c%a8j=w}(CK;r9gp4FCZD|E|tQumCCm0G2tbRR910 literal 0 HcmV?d00001 diff --git a/charts/elasticsearch-operator/Chart.yaml b/charts/elasticsearch-operator/Chart.yaml index 6a262cb22..a69e8d938 100644 --- a/charts/elasticsearch-operator/Chart.yaml +++ b/charts/elasticsearch-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Elasticsearch operator name: elasticsearch-operator -version: 0.1.3 +version: 0.1.4 sources: - https://github.com/upmc-enterprises/elasticsearch-operator maintainers: diff --git a/charts/index.yaml b/charts/index.yaml index 4dc252301..420cff183 100755 --- a/charts/index.yaml +++ b/charts/index.yaml @@ -2,9 +2,9 @@ apiVersion: v1 entries: elasticsearch: - apiVersion: v1 - created: 2018-10-16T10:12:02.694717502+02:00 + created: "2019-07-30T15:16:54.422739+01:00" description: A Helm chart for Elasticsearch cluster - digest: b9f9f433a766156b870cff56d81657159376029d10024ffd4df57f2d1954291c + digest: 9920b21e981186f20195c4c8871da7d3872527df269d990ab57fffcec3014cf1 maintainers: - email: alen.komljen@live.com name: komljen @@ -16,7 +16,7 @@ entries: - elasticsearch-0.1.5.tgz version: 0.1.5 - apiVersion: v1 - created: 2018-10-16T10:12:02.694270824+02:00 + created: "2019-07-30T15:16:54.422324+01:00" description: A Helm chart for Elasticsearch cluster digest: 3437e67980b4369ae18d10bbb64ad62b9e6af6da0d11dc79628d39ce00ba06fa maintainers: @@ -30,7 +30,7 @@ entries: - elasticsearch-0.1.4.tgz version: 0.1.4 - apiVersion: v1 - created: 2018-10-16T10:12:02.692837786+02:00 + created: "2019-07-30T15:16:54.421176+01:00" description: A Helm chart for Elasticsearch cluster digest: 2dee389105b87cfaf0150f4215f927bcb79c22f877e801850419a17284191343 maintainers: @@ -44,7 +44,7 @@ entries: - elasticsearch-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: 2018-10-16T10:12:02.69122185+02:00 + created: "2019-07-30T15:16:54.420437+01:00" description: A Helm chart for Elasticsearch cluster digest: 398bcb148fe08fe7ae0d5918af25efd28fe60fd77f47ae2760f1347643d76aab maintainers: @@ -58,7 +58,7 @@ entries: - elasticsearch-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: 2018-10-16T10:12:02.68975502+02:00 + created: "2019-07-30T15:16:54.419683+01:00" description: A Helm chart for Elasticsearch cluster digest: de2209bffb7a05c436354b2514abadacb83007dd0d59941cb78b340c6db9cc52 maintainers: @@ -72,7 +72,7 @@ entries: - elasticsearch-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: 2018-10-16T10:12:02.688211831+02:00 + created: "2019-07-30T15:16:54.418977+01:00" description: A Helm chart for Elasticsearch cluster digest: 37bc0b51a58e73e29221062df665ce7234f36689dc7051164141680b6c0096bd maintainers: @@ -86,7 +86,21 @@ entries: version: 0.1.0 elasticsearch-operator: - apiVersion: v1 - created: 2018-10-16T10:12:02.698275452+02:00 + created: "2019-07-30T15:16:54.426868+01:00" + description: A Helm chart for Elasticsearch operator + digest: f09fe0f05ada865836bfed8a82ec7920701b1c781d75e14523edd5c6d0b00fe3 + maintainers: + - email: alen.komljen@live.com + name: komljen + url: https://akomljen.com + name: elasticsearch-operator + sources: + - https://github.com/upmc-enterprises/elasticsearch-operator + urls: + - elasticsearch-operator-0.1.4.tgz + version: 0.1.4 + - apiVersion: v1 + created: "2019-07-30T15:16:54.426526+01:00" description: A Helm chart for Elasticsearch operator digest: 07a48f24d2a1e86e41acfb427a4e479b35067042a48385bd4df2caa7b38d9787 maintainers: @@ -100,7 +114,7 @@ entries: - elasticsearch-operator-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: 2018-10-16T10:12:02.698057822+02:00 + created: "2019-07-30T15:16:54.425932+01:00" description: A Helm chart for Elasticsearch operator digest: bf9e1bf0f857acdbb281ac2480add1f5a9d33b303e3cba4fffdc6921cbf27f5f maintainers: @@ -114,7 +128,7 @@ entries: - elasticsearch-operator-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: 2018-10-16T10:12:02.697636392+02:00 + created: "2019-07-30T15:16:54.425071+01:00" description: A Helm chart for Elasticsearch operator digest: 65b48cf707f5bd8170a22f4827236c36591dde215712b29a8df0136e64d57a49 maintainers: @@ -128,7 +142,7 @@ entries: - elasticsearch-operator-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: 2018-10-16T10:12:02.69527483+02:00 + created: "2019-07-30T15:16:54.423466+01:00" description: A Helm chart for Elasticsearch operator digest: 1c21e32521c3843f04e38892ea432a2529d819019f7bb919cc48bedf9a629400 maintainers: @@ -140,4 +154,4 @@ entries: urls: - elasticsearch-operator-0.1.0.tgz version: 0.1.0 -generated: 2018-10-16T10:12:02.683509122+02:00 +generated: "2019-07-30T15:16:54.416727+01:00" From d6cd3d69b82bd7210818be154646cddd5218e52f Mon Sep 17 00:00:00 2001 From: Alen Komljen Date: Wed, 5 Jun 2019 14:04:39 +0200 Subject: [PATCH 3/9] Apply node selector and tolerations to client nodes, and tolerate NoSchedule for sysctl DS --- README.md | 4 ++-- pkg/k8sutil/daemonsets.go | 6 ++++++ pkg/k8sutil/deployments.go | 4 +++- pkg/processor/processor.go | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b91a5691b..c45ecf15b 100644 --- a/README.md +++ b/README.md @@ -71,9 +71,9 @@ Following parameters are available to customize the elastic cluster: - image: Image to use (Note: Using [custom image](https://github.com/upmc-enterprises/kibana-docker) since upstream has x-pack installed and causes issues) - cerebro: Deploy [cerebro](https://github.com/lmenezes/cerebro) to cluster and automatically reference certs from secret - image: Image to use (Note: Using [custom image](https://github.com/upmc-enterprises/cerebro-docker) since upstream has no docker images available) -- nodeSelector: list of k8s NodeSelectors which are applied to the Master Nodes and Data Nodes +- nodeSelector: list of k8s NodeSelectors which are applied to the master, data, and client nodes - `key: value` -- tolerations: list of k8s Tolerations which are applied to the Master Nodes and Data Nodes +- tolerations: list of k8s Tolerations which are applied to the master, data, and client nodes - `- effect:` eg: NoSchedule, NoExecute `key:` eg: somekey `operator:` eg: exists diff --git a/pkg/k8sutil/daemonsets.go b/pkg/k8sutil/daemonsets.go index e9af17882..ae693a104 100644 --- a/pkg/k8sutil/daemonsets.go +++ b/pkg/k8sutil/daemonsets.go @@ -67,6 +67,12 @@ func (k *K8sutil) CreateNodeInitDaemonset() error { NodeSelector: map[string]string{ "beta.kubernetes.io/os": "linux", }, + Tolerations: []v1.Toleration{ + { + Effect: "NoSchedule", + Operator: "Exists", + }, + }, Containers: []v1.Container{ v1.Container{ Name: "sysctl-conf", diff --git a/pkg/k8sutil/deployments.go b/pkg/k8sutil/deployments.go index 0a1b21882..d369a2fa8 100644 --- a/pkg/k8sutil/deployments.go +++ b/pkg/k8sutil/deployments.go @@ -96,7 +96,7 @@ func (k *K8sutil) DeleteDeployment(clusterName, namespace, deploymentType string // CreateClientDeployment creates the client deployment func (k *K8sutil) CreateClientDeployment(baseImage string, replicas *int32, javaOptions, clientJavaOptions string, - resources myspec.Resources, imagePullSecrets []myspec.ImagePullSecrets, imagePullPolicy, serviceAccountName, clusterName, statsdEndpoint, networkHost, namespace string, useSSL *bool, affinity v1.Affinity, annotations map[string]string) error { + resources myspec.Resources, imagePullSecrets []myspec.ImagePullSecrets, imagePullPolicy, serviceAccountName, clusterName, statsdEndpoint, networkHost, namespace string, useSSL *bool, affinity v1.Affinity, annotations map[string]string, nodeSelector map[string]string, tolerations []v1.Toleration) error { component := fmt.Sprintf("elasticsearch-%s", clusterName) discoveryServiceNameCluster := fmt.Sprintf("%s-%s", discoveryServiceName, clusterName) @@ -171,6 +171,8 @@ func (k *K8sutil) CreateClientDeployment(baseImage string, replicas *int32, java Annotations: annotations, }, Spec: v1.PodSpec{ + Tolerations: tolerations, + NodeSelector: nodeSelector, Affinity: &affinity, Containers: []v1.Container{ v1.Container{ diff --git a/pkg/processor/processor.go b/pkg/processor/processor.go index be65e2d3d..8ce329287 100644 --- a/pkg/processor/processor.go +++ b/pkg/processor/processor.go @@ -161,7 +161,7 @@ func (p *Processor) refreshClusters() error { DataNodeReplicas: cluster.Spec.DataNodeReplicas, Zones: cluster.Spec.Zones, DataDiskSize: cluster.Spec.DataDiskSize, - MasterDiskSize: cluster.Spec.MasterDiskSize, + MasterDiskSize: cluster.Spec.MasterDiskSize, JavaOptions: cluster.Spec.JavaOptions, ClientJavaOptions: cluster.Spec.ClientJavaOptions, DataJavaOptions: cluster.Spec.DataJavaOptions, @@ -375,7 +375,7 @@ func (p *Processor) processElasticSearchCluster(c *myspec.ElasticsearchCluster) } if err := p.k8sclient.CreateClientDeployment(baseImage, &c.Spec.ClientNodeReplicas, c.Spec.JavaOptions, c.Spec.ClientJavaOptions, - c.Spec.Resources, c.Spec.ImagePullSecrets, c.Spec.ImagePullPolicy, c.Spec.ServiceAccountName, c.ObjectMeta.Name, c.Spec.Instrumentation.StatsdHost, c.Spec.NetworkHost, c.ObjectMeta.Namespace, c.Spec.UseSSL, c.Spec.Affinity, c.Spec.Annotations); err != nil { + c.Spec.Resources, c.Spec.ImagePullSecrets, c.Spec.ImagePullPolicy, c.Spec.ServiceAccountName, c.ObjectMeta.Name, c.Spec.Instrumentation.StatsdHost, c.Spec.NetworkHost, c.ObjectMeta.Namespace, c.Spec.UseSSL, c.Spec.Affinity, c.Spec.Annotations, c.Spec.NodeSelector, c.Spec.Tolerations); err != nil { logrus.Error("Error creating client deployment ", err) return err } From 04d2634d9614b271d48e85a45d58d7a14ed23059 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Wed, 7 Aug 2019 20:56:37 +0100 Subject: [PATCH 4/9] Fix Cerebro and Kibana deployments to Linux nodes This is so that deployments on mixed Kubernetes clusters will bring up these services on Linux only. --- pkg/k8sutil/deployments.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/k8sutil/deployments.go b/pkg/k8sutil/deployments.go index d369a2fa8..175ee9aef 100644 --- a/pkg/k8sutil/deployments.go +++ b/pkg/k8sutil/deployments.go @@ -407,6 +407,9 @@ func (k *K8sutil) CreateKibanaDeployment(baseImage, clusterName, namespace strin }, }, Spec: v1.PodSpec{ + NodeSelector: map[string]string{ + "beta.kubernetes.io/os": "linux", + }, Containers: []v1.Container{ v1.Container{ Name: deploymentName, @@ -540,6 +543,9 @@ func (k *K8sutil) CreateCerebroDeployment(baseImage, clusterName, namespace, cer }, }, Spec: v1.PodSpec{ + NodeSelector: map[string]string{ + "beta.kubernetes.io/os": "linux", + }, Containers: []v1.Container{ { Name: deploymentName, From d95ffb29e72412555f8b18be0245920e28943821 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Wed, 7 Aug 2019 20:57:55 +0100 Subject: [PATCH 5/9] Bump operator version to 0.4.1 --- Makefile | 2 +- cmd/operator/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 389e0cde3..a6b74f6c9 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,8 @@ .PHONY: all build container push clean test -TAG ?= 0.4.0 PREFIX ?= upmcenterprises +TAG ?= 0.4.1 pkgs = $(shell go list ./... | grep -v /vendor/ | grep -v /test/) # go source files, ignore vendor directory SRC = $(shell find . -type f -name '*.go' -not -path "./vendor/*") diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 708e7f405..4b9cfa4fa 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -45,7 +45,7 @@ import ( ) var ( - appVersion = "0.4.0" + appVersion = "0.4.1" printVersion bool baseImage string From 748180b376db0b4514014cf77f593a99a09c4691 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Wed, 7 Aug 2019 21:01:15 +0100 Subject: [PATCH 6/9] Add nodeSelector + example to elasticsearch helm chart Impossible to use the feature in the CRD without this --- charts/elasticsearch/templates/cluster.yaml | 2 ++ charts/elasticsearch/values.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/charts/elasticsearch/templates/cluster.yaml b/charts/elasticsearch/templates/cluster.yaml index 9063f2c66..8a0afca34 100644 --- a/charts/elasticsearch/templates/cluster.yaml +++ b/charts/elasticsearch/templates/cluster.yaml @@ -57,3 +57,5 @@ spec: {{- end }} resources: {{ toYaml .Values.resources | indent 4 }} + nodeSelector: + {{ toYaml .Values.nodeSelector | indent 4 }} \ No newline at end of file diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml index 9096a56bc..28ff3cfdc 100644 --- a/charts/elasticsearch/values.yaml +++ b/charts/elasticsearch/values.yaml @@ -61,3 +61,6 @@ resources: limits: memory: 1024Mi cpu: '1' + +nodeSelector: + beta.kubernetes.io/os: linux \ No newline at end of file From 7d30abcd1fc1397c149d3e9f0676459915ceebd2 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Wed, 7 Aug 2019 21:18:45 +0100 Subject: [PATCH 7/9] Bump elasticsearch helm chart to 0.1.6 --- charts/elasticsearch-0.1.6.tgz | Bin 0 -> 2101 bytes charts/elasticsearch/Chart.yaml | 2 +- charts/index.yaml | 40 +++++++++++++++++++++----------- 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 charts/elasticsearch-0.1.6.tgz diff --git a/charts/elasticsearch-0.1.6.tgz b/charts/elasticsearch-0.1.6.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f03b40147fe7c3d6968f18f1a33496e3d77d875b GIT binary patch literal 2101 zcmV-52+H>#iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PIP>+4c0*;4NoDA2$T?uxr6K^&wl4u^o+ z9cdYJNtWcwb{ySjKakv&cGrrXyZT}jXBv>S+?gRc|2XqA3T7S8Ei#jriVAY?6tGkVo^_oCa#34{hE$A8$GAjeGm-#S zjEfAIKuOP4CElU@Uhp;2TvY@>vI;Y3UJ!uVhzv^Sw9Uq2*31XmNZE5xVpVN&4C}N! zEAGmA;W@^&uJQz>L!%A1XvaO~L}@h4DMQxniBmeEbMnwOc*xO@|1}de+WSrbcf|kn zIGqjSe>$H&#{cIS2XKl@RtpEw_94#qhYckM@Vev{xCI8kJpJ)+$x@k$Ifn%-xj;{F zin(A0Va*I@3xO7#f(3$R)?xu%It5p%HsG+*f;qI5@QST4BLD`qvfL?im4T1tZYUQj zKSz`Fw{~7H&`5M>34mj(4CZt~kKU#P;6T?xoMCRzW#G^{LUO@Tx>u+L&za3&LMrA{ zSa+sijt!sRC{b5<#@}NGlRtCvj;+}X?Q904Ar zCDXQ4&g&Bcago8235#AuR~j?0M+9I|=jZ62_i}8*>Xm8p5{p`32BYtBjphob)rbH@ zTiviu-z>RNGD~Snj|l*)U5V21oP}G30PNWq1P8fLrf6*Cr)rBPUINj4)+rM_B&SMPa3< zAr_wgbhcI8N>6tLJKv*RjoF1waA7+vLHtXj*4*DUXfjv_H=<1FlF>eUvwRYm!Wys8 z->Kfnrzp^22#;JaUcFR;=T})fPtN&*Nw(MCjkRLz(8fqKSL4Xjd?m`-ECdcAIT~CT zb(^%I?OT?V&gmb$m6)@|UIC@DE`!mC5QE#B+@I^$8m+U@H!7?`0+>yvKk_h>>pFv3 zn)>oV@QM#9C+YOKOZw&HOG13uouRV|7}tpKY#K1 z*%@`0?jF{-tNuTlP6qe?Z1!0Hf1Yt-kU1__`)hkjDIq7})&!J=R$RJpqq96mYvWDc z&}IMxc4c}0M!3EP`U(Xyi`3sau-POn-=C&w`ccmKmYhV|rhB+W+W&Mh{~wHx#sAw9 zg+^nk)4#bDxFh~2>2W%U|M~IcG5$ZxxV|1A!kSl^FQY;g?@OKUDzBEj#0(C{n+@?) zN!S`>}W#IK_lQ4Vwk>(&8Me)u|{Kf zf$#yGsbvoHqwtegXZ3Q)FJYAIgrO|L@3_m5&=A;mjb$yw75rK=!IvBhU|NU$Q}Po= z>4Dz)HT+pDEHG!aMX;(u`0KW0h^KBUO5fvzS_BK951sFezFJ%bjhsF|^RzyzT8;VF zcPhtkv9F;24{K%LeY&PvPHnh!OBj7&lP~OOkSC+qe@Ceg?Vpe1zdJsb|JwrKKA@mG z^8eAd)A^13KYPsopJjCM-%e9UeUle3)%Ap&b6I5l0`a89e$lalxzK&yU7G<2wm{Le zZ%pez-a6g>D}%yj6I(l<0Hgd)F5GOA-Ar>5_y7jAU^&9*4^n`2{#Oq*6V%GovC+n(6V>vMz`(8;FF&yMV-aqbK6G~oNBw>41^@xZ2l^&u+tJFL4_< zqoJa=6n(&Qc+!1vW(U07x8y)zOWaEA;GCbp-4fq0;}!?Lz7DQ@*@}Wu^QuXMTNrhy zfH+Shu-a^{2Tb-iI3(}K%s!uJIJz#;lb`4=T>7!KI+$uJr3u0YAWd|GknWMt!%%Ne z&k@M%+ds}VIj1K+(E9lshUs9PH{~bNnf1hO>z)R*F8W~`{XnMFPQNp6;qVPSeX8Ac=q22!f&(>Ni<1E+` zg@Bb%3#gdOODOI$+&-a;_huYE+lg{D_8;w| zUCZ%K(1PXXwGP;aC5O~rXmUsw?3^4@S7~ziPjUcnnBl6n@WbgdOQ<&L9p;WuULYGs fI-}k_Hp`FWaXgOS)A&~a00960h34ix04M+ea9|tl literal 0 HcmV?d00001 diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml index 51c17a090..4bcc2ec07 100644 --- 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.5 +version: 0.1.6 sources: - https://github.com/upmc-enterprises/elasticsearch-operator maintainers: diff --git a/charts/index.yaml b/charts/index.yaml index 420cff183..aa0c6dcb5 100755 --- a/charts/index.yaml +++ b/charts/index.yaml @@ -2,7 +2,21 @@ apiVersion: v1 entries: elasticsearch: - apiVersion: v1 - created: "2019-07-30T15:16:54.422739+01:00" + created: "2019-08-07T20:51:17.911062+01:00" + description: A Helm chart for Elasticsearch cluster + digest: caebb410909e560ec9664d1d7f2af6be57532b4c3eebbaad6c5a837f8344985d + maintainers: + - email: alen.komljen@live.com + name: komljen + url: https://akomljen.com + name: elasticsearch + sources: + - https://github.com/upmc-enterprises/elasticsearch-operator + urls: + - elasticsearch-0.1.6.tgz + version: 0.1.6 + - apiVersion: v1 + created: "2019-08-07T20:51:17.910827+01:00" description: A Helm chart for Elasticsearch cluster digest: 9920b21e981186f20195c4c8871da7d3872527df269d990ab57fffcec3014cf1 maintainers: @@ -16,7 +30,7 @@ entries: - elasticsearch-0.1.5.tgz version: 0.1.5 - apiVersion: v1 - created: "2019-07-30T15:16:54.422324+01:00" + created: "2019-08-07T20:51:17.910579+01:00" description: A Helm chart for Elasticsearch cluster digest: 3437e67980b4369ae18d10bbb64ad62b9e6af6da0d11dc79628d39ce00ba06fa maintainers: @@ -30,7 +44,7 @@ entries: - elasticsearch-0.1.4.tgz version: 0.1.4 - apiVersion: v1 - created: "2019-07-30T15:16:54.421176+01:00" + created: "2019-08-07T20:51:17.910263+01:00" description: A Helm chart for Elasticsearch cluster digest: 2dee389105b87cfaf0150f4215f927bcb79c22f877e801850419a17284191343 maintainers: @@ -44,7 +58,7 @@ entries: - elasticsearch-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: "2019-07-30T15:16:54.420437+01:00" + created: "2019-08-07T20:51:17.909306+01:00" description: A Helm chart for Elasticsearch cluster digest: 398bcb148fe08fe7ae0d5918af25efd28fe60fd77f47ae2760f1347643d76aab maintainers: @@ -58,7 +72,7 @@ entries: - elasticsearch-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: "2019-07-30T15:16:54.419683+01:00" + created: "2019-08-07T20:51:17.909066+01:00" description: A Helm chart for Elasticsearch cluster digest: de2209bffb7a05c436354b2514abadacb83007dd0d59941cb78b340c6db9cc52 maintainers: @@ -72,7 +86,7 @@ entries: - elasticsearch-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: "2019-07-30T15:16:54.418977+01:00" + created: "2019-08-07T20:51:17.908817+01:00" description: A Helm chart for Elasticsearch cluster digest: 37bc0b51a58e73e29221062df665ce7234f36689dc7051164141680b6c0096bd maintainers: @@ -86,9 +100,9 @@ entries: version: 0.1.0 elasticsearch-operator: - apiVersion: v1 - created: "2019-07-30T15:16:54.426868+01:00" + created: "2019-08-07T20:51:17.912135+01:00" description: A Helm chart for Elasticsearch operator - digest: f09fe0f05ada865836bfed8a82ec7920701b1c781d75e14523edd5c6d0b00fe3 + digest: ec28f68536ae3d41080091a385f72d8750a467dfef0671414dcc9b5431e7acba maintainers: - email: alen.komljen@live.com name: komljen @@ -100,7 +114,7 @@ entries: - elasticsearch-operator-0.1.4.tgz version: 0.1.4 - apiVersion: v1 - created: "2019-07-30T15:16:54.426526+01:00" + created: "2019-08-07T20:51:17.911904+01:00" description: A Helm chart for Elasticsearch operator digest: 07a48f24d2a1e86e41acfb427a4e479b35067042a48385bd4df2caa7b38d9787 maintainers: @@ -114,7 +128,7 @@ entries: - elasticsearch-operator-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: "2019-07-30T15:16:54.425932+01:00" + created: "2019-08-07T20:51:17.911689+01:00" description: A Helm chart for Elasticsearch operator digest: bf9e1bf0f857acdbb281ac2480add1f5a9d33b303e3cba4fffdc6921cbf27f5f maintainers: @@ -128,7 +142,7 @@ entries: - elasticsearch-operator-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: "2019-07-30T15:16:54.425071+01:00" + created: "2019-08-07T20:51:17.911479+01:00" description: A Helm chart for Elasticsearch operator digest: 65b48cf707f5bd8170a22f4827236c36591dde215712b29a8df0136e64d57a49 maintainers: @@ -142,7 +156,7 @@ entries: - elasticsearch-operator-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: "2019-07-30T15:16:54.423466+01:00" + created: "2019-08-07T20:51:17.911261+01:00" description: A Helm chart for Elasticsearch operator digest: 1c21e32521c3843f04e38892ea432a2529d819019f7bb919cc48bedf9a629400 maintainers: @@ -154,4 +168,4 @@ entries: urls: - elasticsearch-operator-0.1.0.tgz version: 0.1.0 -generated: "2019-07-30T15:16:54.416727+01:00" +generated: "2019-08-07T20:51:17.907693+01:00" From d21aee111ba05dae64f0d203c0865b41029f99f6 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Fri, 9 Aug 2019 11:46:02 +0100 Subject: [PATCH 8/9] Add master-volume-size to elasticsearch helm chart config Missing property which is used in es-operator to define master volume sizes in the pvc. --- charts/elasticsearch/templates/cluster.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/elasticsearch/templates/cluster.yaml b/charts/elasticsearch/templates/cluster.yaml index 8a0afca34..edb041ca0 100644 --- a/charts/elasticsearch/templates/cluster.yaml +++ b/charts/elasticsearch/templates/cluster.yaml @@ -26,6 +26,7 @@ spec: {{- else }} zones: [] {{- end }} + master-volume-size: {{ .Values.masterVolumeSize }} data-volume-size: {{ .Values.dataVolumeSize }} java-options: {{ .Values.javaOpts }} {{- if .Values.image.pullSecret }} From 374335ee877229f561e82bb9244efb69bc161a89 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Fri, 9 Aug 2019 11:48:47 +0100 Subject: [PATCH 9/9] Bump elasticsearch helm chart to 0.1.7 --- charts/elasticsearch-0.1.7.tgz | Bin 0 -> 2112 bytes charts/elasticsearch/Chart.yaml | 2 +- charts/index.yaml | 42 +++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 charts/elasticsearch-0.1.7.tgz diff --git a/charts/elasticsearch-0.1.7.tgz b/charts/elasticsearch-0.1.7.tgz new file mode 100644 index 0000000000000000000000000000000000000000..3be6826dd8e74c5bae3782ea1514f0450399be32 GIT binary patch literal 2112 zcmV-G2*39qiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI!5B^i<{+vih1dqHwn+Fi?b+PF4?iUuStcVfPordo;P5a;JB%M4P9ZknaAj3j_1 z<01nlP||Z%ijOG26MTg!K+GfKctLFo4r0h5-v8pmThIJaA z1$WD8<~fFyF7pJXL!%A1XonrE5CiJZCn85h6#@sN@gid>4X5V$}Lekp0jYP5P%&UgWw<+$`rM&{8VMp#7iKW&pKs-ryRid zbI1j=!51yMZ@{nNKR~%98mLKO&QTN=F1Qe0S>6*Xi-q^pC?Er&awd|R!TSv$T~Ju) zafpQ%Kb~zAx6tD)!PfUES3`DT6P(!=OA!CYs1^5j4VnyA!Hp;rddX;)yEOks_; z=tslO6sZ59HDkQ@!p zjJiu&-}VhlN{{Iuy_J}=#ZCcBWnBh?0U-uAH@QF8FBMv6qi>X0h6FGjjep=_Cf8L4 z(=_$vgWx6aQ;yQ{q)qze=u1L;*qx!k+$rP9XXyG$SKj(uR+mqmgr9J9@Bd9w9=>}0 z?&TSEm+k@9xUc>{8jpJS|8%;q{~u?Z7-Wvi#qQdkQcB24xHSP~p%s@d+~_RN(b{;E z*R&Y`fo)mdy%Dajfxbn7%p&!74y@Nn!}q6gn%>G8-;$F^TXzq4Nc*2I=Kq6nTl{}m zqR?n8b^15A0{6uKD4nFe_&=VE_VNEHDe7hu;Anproctpujno2!oDiQO_}eWJ?oz4jKWc5X1C+Y(72Z>lGTq z3xv<$OeJ$TJ_J9IZVrPlZ1RO2^zvjB`|l|Asr_?5{=4J0{NEG+4*><; zlm92_=;%iNKRVv$|Hl|@{I}KAQQzbROm#IP=Uf(9w?I5;uwQhnU@ml@_t$0sg3VCW z?HkiNkT*`Z`^uoOUdPtXC%`Dbl?&JFWII!z1U`d7Em)2)_`?7O9|nyK6F0VVm&E7l zEF?cZ-{jcXA=A2*jdHdP_ogTI^12-11+=nh{j(*zZk)TqTMhUw=?%{=@z4M{NnLf< z?1L76n4(*t4c6=I#%sqGuwD-Wh~aDh#5dE4*`Q+W{d6F;xQhs?-NDpF-6E6sqB~gH zuv}!2=q{8wPa>$0((u<;aRAyPeT}(!hf_bZQuJs(1DA#Gb0!!W!DHqc@=1E<*pNp^89da$}1d;w_T7Nfk!Pq=jJa;%Z*k zj=qVtoy1MF4f=}SP;^nw{z-RXpe@96*OEPf4RIr}1&;m-?uPh=88_hZ^>y(7%SIFo z>Q{B{++eSL1;lw8(b#%(9W=AM!9IC6(02Jm&Czy=j{HQoG1lAGY5}p0lsX7&R5j5x zthz%&2Y9_Zr$_X&YyUV`C#sJ4K`z^a?8g&~ zZv9V}C`!JN%HRX8aUcFW9o_u@@6jIrd6aPgZEU9D5@r<_1(yrZEI(%p zw449`+DdC>oCUi?Az&fY3`*wmC6|kDe2vW{msw|a+_a|piaAOHwa5oH}ar=bM zKABA$Ff06@u&kR?Uh3`*a qT0*r^A2D}?@&ef~(i!z}50>o5e(cBZY5Xey0RR6n^?=_1DgXd&1P(d? literal 0 HcmV?d00001 diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml index 4bcc2ec07..5f557c45a 100644 --- 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.6 +version: 0.1.7 sources: - https://github.com/upmc-enterprises/elasticsearch-operator maintainers: diff --git a/charts/index.yaml b/charts/index.yaml index aa0c6dcb5..9ec8661aa 100755 --- a/charts/index.yaml +++ b/charts/index.yaml @@ -2,7 +2,21 @@ apiVersion: v1 entries: elasticsearch: - apiVersion: v1 - created: "2019-08-07T20:51:17.911062+01:00" + created: "2019-08-09T11:48:21.462343+01:00" + description: A Helm chart for Elasticsearch cluster + digest: 643d5c803963b18edfe18b15d557cc71d4e3e0e9cf988c6426d7972714638c5b + maintainers: + - email: alen.komljen@live.com + name: komljen + url: https://akomljen.com + name: elasticsearch + sources: + - https://github.com/upmc-enterprises/elasticsearch-operator + urls: + - elasticsearch-0.1.7.tgz + version: 0.1.7 + - apiVersion: v1 + created: "2019-08-09T11:48:21.46212+01:00" description: A Helm chart for Elasticsearch cluster digest: caebb410909e560ec9664d1d7f2af6be57532b4c3eebbaad6c5a837f8344985d maintainers: @@ -16,7 +30,7 @@ entries: - elasticsearch-0.1.6.tgz version: 0.1.6 - apiVersion: v1 - created: "2019-08-07T20:51:17.910827+01:00" + created: "2019-08-09T11:48:21.461535+01:00" description: A Helm chart for Elasticsearch cluster digest: 9920b21e981186f20195c4c8871da7d3872527df269d990ab57fffcec3014cf1 maintainers: @@ -30,7 +44,7 @@ entries: - elasticsearch-0.1.5.tgz version: 0.1.5 - apiVersion: v1 - created: "2019-08-07T20:51:17.910579+01:00" + created: "2019-08-09T11:48:21.461231+01:00" description: A Helm chart for Elasticsearch cluster digest: 3437e67980b4369ae18d10bbb64ad62b9e6af6da0d11dc79628d39ce00ba06fa maintainers: @@ -44,7 +58,7 @@ entries: - elasticsearch-0.1.4.tgz version: 0.1.4 - apiVersion: v1 - created: "2019-08-07T20:51:17.910263+01:00" + created: "2019-08-09T11:48:21.460186+01:00" description: A Helm chart for Elasticsearch cluster digest: 2dee389105b87cfaf0150f4215f927bcb79c22f877e801850419a17284191343 maintainers: @@ -58,7 +72,7 @@ entries: - elasticsearch-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: "2019-08-07T20:51:17.909306+01:00" + created: "2019-08-09T11:48:21.459669+01:00" description: A Helm chart for Elasticsearch cluster digest: 398bcb148fe08fe7ae0d5918af25efd28fe60fd77f47ae2760f1347643d76aab maintainers: @@ -72,7 +86,7 @@ entries: - elasticsearch-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: "2019-08-07T20:51:17.909066+01:00" + created: "2019-08-09T11:48:21.459067+01:00" description: A Helm chart for Elasticsearch cluster digest: de2209bffb7a05c436354b2514abadacb83007dd0d59941cb78b340c6db9cc52 maintainers: @@ -86,7 +100,7 @@ entries: - elasticsearch-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: "2019-08-07T20:51:17.908817+01:00" + created: "2019-08-09T11:48:21.458516+01:00" description: A Helm chart for Elasticsearch cluster digest: 37bc0b51a58e73e29221062df665ce7234f36689dc7051164141680b6c0096bd maintainers: @@ -100,9 +114,9 @@ entries: version: 0.1.0 elasticsearch-operator: - apiVersion: v1 - created: "2019-08-07T20:51:17.912135+01:00" + created: "2019-08-09T11:48:21.464539+01:00" description: A Helm chart for Elasticsearch operator - digest: ec28f68536ae3d41080091a385f72d8750a467dfef0671414dcc9b5431e7acba + digest: b0097f1f8f70d7dc5230ab9f75569eb6894198ac0b9dd6ef3fc668cec9b1cb7e maintainers: - email: alen.komljen@live.com name: komljen @@ -114,7 +128,7 @@ entries: - elasticsearch-operator-0.1.4.tgz version: 0.1.4 - apiVersion: v1 - created: "2019-08-07T20:51:17.911904+01:00" + created: "2019-08-09T11:48:21.464283+01:00" description: A Helm chart for Elasticsearch operator digest: 07a48f24d2a1e86e41acfb427a4e479b35067042a48385bd4df2caa7b38d9787 maintainers: @@ -128,7 +142,7 @@ entries: - elasticsearch-operator-0.1.3.tgz version: 0.1.3 - apiVersion: v1 - created: "2019-08-07T20:51:17.911689+01:00" + created: "2019-08-09T11:48:21.463831+01:00" description: A Helm chart for Elasticsearch operator digest: bf9e1bf0f857acdbb281ac2480add1f5a9d33b303e3cba4fffdc6921cbf27f5f maintainers: @@ -142,7 +156,7 @@ entries: - elasticsearch-operator-0.1.2.tgz version: 0.1.2 - apiVersion: v1 - created: "2019-08-07T20:51:17.911479+01:00" + created: "2019-08-09T11:48:21.463377+01:00" description: A Helm chart for Elasticsearch operator digest: 65b48cf707f5bd8170a22f4827236c36591dde215712b29a8df0136e64d57a49 maintainers: @@ -156,7 +170,7 @@ entries: - elasticsearch-operator-0.1.1.tgz version: 0.1.1 - apiVersion: v1 - created: "2019-08-07T20:51:17.911261+01:00" + created: "2019-08-09T11:48:21.462871+01:00" description: A Helm chart for Elasticsearch operator digest: 1c21e32521c3843f04e38892ea432a2529d819019f7bb919cc48bedf9a629400 maintainers: @@ -168,4 +182,4 @@ entries: urls: - elasticsearch-operator-0.1.0.tgz version: 0.1.0 -generated: "2019-08-07T20:51:17.907693+01:00" +generated: "2019-08-09T11:48:21.457456+01:00"