Merge pull request #127 from rrahman-nv/master

Added toggling of etcd-operator as a coordination backend

Author: armab

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## In Development
+* Added support to toggle etcd-operator as a coordination backend (#127) (by @rrahman-nv)
 
 ## v0.26.0
 * Added custom annotations to sensorcontainer and actionrunner Pods (#123) (by @stefangusa)

requirements.yaml

@@ -15,3 +15,5 @@ dependencies:
   - name: etcd-operator
     version: 0.10.0
     repository: https://kubernetes-charts.storage.googleapis.com/
+    condition: etcd-operator.enabled
+

templates/configmaps_st2-conf.yaml

@@ -20,8 +20,10 @@ data:
   st2.docker.conf: |
     [auth]
     api_url = http://{{ .Release.Name }}-st2api{{ template "enterpriseSuffix" . }}:9101/
+    {{- if index .Values "etcd-operator" "enabled" }}
     [coordination]
     url = etcd://{{ index .Values "etcd-operator" "etcdCluster" "name" }}-client:2379
+    {{- end }}
     {{- 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

@@ -470,6 +470,9 @@ rabbitmq-ha:
 ##
 etcd-operator:
   # we don't need backup & restore etcd for short-lived coordination operations
+  # Change to `false` to disable in-cluster ectd deployment.
+  # Specify your external [coordination] connection parameters under st2.config
+  enabled: true
   deployments:
     backupOperator: false
     restoreOperator: false