Merge pull request #81 from trstruth/trstruth/etcd-operator

Use stable etcd operator as opposed to etcd from incubator

Author: armab

.circleci/config.yml

@@ -86,7 +86,7 @@ jobs:
             helm dependency update
       - run:
           name: Helm install stackstorm-ha chart (Community)
-          command: helm install --debug --wait --name stackstorm-ha .
+          command: helm install --timeout 500 --debug --wait --name stackstorm-ha .
       - run:
           name: Helm test (Community)
           command: helm test stackstorm-ha --parallel --cleanup

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## In Development
 
+## v0.21.0
+* Change etcd dependency from incubator/etcd to stable/etcd-operator (#81)
+
 ## v0.20.0
 * Add option to disable MongoDB and RabbitMQ in-cluster deployment and configuration (#79)
 * Compose multi-node connection string for MongoDB cluster instead of using loadbalancer single host (#80)

Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 # Update StackStorm version here to rely on other Docker images tags
 appVersion: 3.2dev
 name: stackstorm-ha
-version: 0.20.0
+version: 0.21.0
 description: StackStorm K8s Helm Chart, optimized for running StackStorm in HA environment.
 home: https://stackstorm.com/#product
 icon: https://avatars1.githubusercontent.com/u/4969009

README.md

@@ -188,7 +188,7 @@ The deployment of RabbitMQ to the k8s cluster can be disabled by setting the rab
 
 ### [etcd](https://docs.stackstorm.com/latest/reference/ha.html#zookeeper-redis)
 StackStorm employs etcd as a distributed coordination backend, required for st2 cluster components to work properly in HA scenario.
-`3` node Raft cluster is deployed via external official Helm chart dependency [etcd](https://github.com/helm/charts/tree/master/incubator/etcd).
+`3` node Raft cluster is deployed via external official Helm chart dependency [etcd-operator](https://github.com/helm/charts/tree/master/stable/etcd-operator).
 As any other Helm dependency, it's possible to further configure it for specific scaling needs via `values.yaml`.
 
 ### Docker registry

requirements.yaml

@@ -20,6 +20,6 @@ dependencies:
     version: 1.6.1
     repository: https://kubernetes-charts.storage.googleapis.com/
     condition: external-dns.enabled
-  - name: etcd
-    version: 0.6.2
-    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
+  - name: etcd-operator
+    version: 0.10.0
+    repository: https://kubernetes-charts.storage.googleapis.com/

templates/configmaps_st2-conf.yaml

@@ -21,7 +21,7 @@ data:
     [auth]
     api_url = http://{{ .Release.Name }}-st2api{{ template "enterpriseSuffix" . }}:9101/
     [coordination]
-    url = etcd://{{ .Release.Name }}-etcd:2379
+    url = etcd://{{ index .Values "etcd-operator" "etcdCluster" "name" }}-client:2379
     {{- if index .Values "rabbitmq-ha" "enabled" }}
     [messaging]
     url = amqp://{{ required "rabbitmq-ha.rabbitmqUsername is required!" (index .Values "rabbitmq-ha" "rabbitmqUsername") }}:{{ required "rabbitmq-ha.rabbitmqPassword is required!" (index .Values "rabbitmq-ha" "rabbitmqPassword") }}@{{ .Release.Name }}-rabbitmq-ha-discovery:5672

values.yaml

@@ -401,10 +401,16 @@ rabbitmq-ha:
 ## Etcd HA configuration (3rd party chart dependency)
 ##
 ## For values.yaml reference:
-## https://github.com/helm/charts/blob/master/incubator/etcd/values.yaml
-##
-etcd:
-  resources: {}
+## https://github.com/helm/charts/tree/master/stable/etcd-operator
+##
+etcd-operator:
+  # we don't need backup & restore etcd for short-lived coordination operations
+  deployments:
+    backupOperator: false
+    restoreOperator: false
+  customResources:
+    # create default etcd cluster
+    createEtcdClusterCRD: true
 
 ##
 ## Docker registry configuration (3rd party chart dependency)