Use rabbitmq-ha subchart

humphreysg · Aug 20, 2018 · d22db08 · d22db08
1 parent 7e9f6a9
commit d22db08
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 51 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ bower_components
 .cache
 pip-selfcheck.json
 keys
+/chart/charts
+/chart/requirements.lock
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -293,6 +293,10 @@ compose:
             rm -rf $tls_tmpdir
           fi
 
+          helm init --client-only
+          helm repo update
+          helm dependency update ./chart/
+
           helm upgrade --install --namespace $namespace \
             -f values.yaml \
             --set image.tag="$CI_COMMIT_SHA" \
@@ -336,6 +340,9 @@ deploy test:
       enableDevUsers: true
       nodeSelector:
         cloud.google.com/gke-nodepool: generic
+      rabbitmq:
+        nodeSelector:
+          cloud.google.com/gke-nodepool: generic
 
 .deploy_review_template: &deploy_review_template
   <<: *deploy_template
@@ -351,6 +358,9 @@ deploy test:
         password: $SENDGRID_PASSWORD
       nodeSelector:
         cloud.google.com/gke-nodepool: generic
+      rabbitmq:
+        nodeSelector:
+          cloud.google.com/gke-nodepool: generic
 
 deploy review:
   <<: *deploy_review_template

diff --git a/chart/requirements.yaml b/chart/requirements.yaml
@@ -0,0 +1,6 @@
+dependencies:
+  - alias: rabbitmq
+    condition: rabbitmq.enabled
+    repository: https://kubernetes-charts.storage.googleapis.com/
+    name: rabbitmq-ha
+    version: 1.6.3
diff --git a/chart/templates/celery-exporter-deployment.yaml b/chart/templates/celery-exporter-deployment.yaml
@@ -19,7 +19,11 @@ spec:
       - name: celery-exporter
         args:
         - --broker
-        - amqp://guest:guest@rabbitmq/
+        {{ if .Values.rabbitmq.enabled -}}
+        - "amqp://{{ .Values.rabbitmq.rabbitmqUsername }}:{{ .Values.rabbitmq.rabbitmqPassword }}@{{ .Release.Name }}-rabbitmq:5672/"
+        {{- else -}}
+        - "amqp://{{ .Values.rabbitmqExternal.username }}:{{ .Values.rabbitmqExternal.password }}@{{ .Values.rabbitmqExternal.host }}:{{ .Values.rabbitmqExternal.port }}/"
+        {{- end }}
         - --enable-events
         image: dimrozakis/celery-exporter
         imagePullPolicy: {{ .Values.image.pullPolicy }}

diff --git a/chart/templates/logstash-deployment.yaml b/chart/templates/logstash-deployment.yaml
@@ -23,13 +23,13 @@ spec:
         - name: ELASTIC_PASSWORD
           value: {{ .Values.elasticsearch.password | default "admin" }}
         - name: RABBITMQ_HOST
-          value: {{ .Values.rabbitmq.host }}
+          value: {{ if .Values.rabbitmq.enabled }}{{ .Release.Name }}-rabbitmq{{ else }}{{ .Values.rabbitmqExternal.host }}{{ end }}
         - name: RABBITMQ_PORT
-          value: "{{ .Values.rabbitmq.port }}"
+          value: "{{ if .Values.rabbitmq.enabled }}5672{{ else }}{{ .Values.rabbitmqExternal.port }}{{ end }}"
         - name: RABBITMQ_USERNAME
-          value: {{ .Values.rabbitmq.username }}
+          value: {{ if .Values.rabbitmq.enabled }}{{ .Values.rabbitmq.rabbitmqUsername }}{{ else }}{{ .Values.rabbitmqExternal.username }}{{ end }}
         - name: RABBITMQ_PASSWORD
-          value: {{ .Values.rabbitmq.password }}
+          value: {{ if .Values.rabbitmq.enabled }}{{ .Values.rabbitmq.rabbitmqPassword }}{{ else }}{{ .Values.rabbitmqExternal.password }}{{ end }}
         - name: INFLUXDB_HOST
           value: {{ .Values.influxdb.host }}
         - name: INFLUXDB_PORT

diff --git a/chart/templates/main-configmap.yaml b/chart/templates/main-configmap.yaml
@@ -35,8 +35,13 @@ data:
     STRIPE_SECRET_APIKEY = "{{ .Values.stripe.secretApiKey }}"
     STRIPE_PUBLIC_APIKEY = "{{ .Values.stripe.publicApiKey }}"
 
-    AMQP_URI = "{{ .Values.rabbitmq.host }}:{{ .Values.rabbitmq.port }}"
-    BROKER_URL = "amqp://{{ .Values.rabbitmq.username }}:{{ .Values.rabbitmq.password }}@{{ .Values.rabbitmq.host }}:{{ .Values.rabbitmq.port }}/"
+    {{ if .Values.rabbitmq.enabled -}}
+    AMQP_URI = "{{ .Release.Name }}-rabbitmq:5672"
+    BROKER_URL = "amqp://{{ .Values.rabbitmq.rabbitmqUsername }}:{{ .Values.rabbitmq.rabbitmqPassword }}@{{ .Release.Name }}-rabbitmq:5672/"
+    {{- else -}}
+    AMQP_URI = "{{ .Values.rabbitmqExternal.host }}:{{ .Values.rabbitmqExternal.port }}"
+    BROKER_URL = "amqp://{{ .Values.rabbitmqExternal.username }}:{{ .Values.rabbitmqExternal.password }}@{{ .Values.rabbitmqExternal.host }}:{{ .Values.rabbitmqExternal.port }}/"
+    {{- end }}
 
     DOCKER_IP = "{{ .Values.docker.host }}"
     DOCKER_PORT = "{{ .Values.docker.port }}"

diff --git a/chart/templates/rabbitmq-deployment.yaml b/chart/templates/rabbitmq-deployment.yaml
diff --git a/chart/templates/rabbitmq-service.yaml b/chart/templates/rabbitmq-service.yaml
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -39,8 +39,26 @@ influxdb:
   port: 8086
   db: telegraf
 
-# Rabbitmq settings. Change this to use a remote RabbitMQ cluster.
+# Options for rabbitmq subchart.
 rabbitmq:
+  enabled: true
+  rabbitmqUsername: guest
+  rabbitmqPassword: guest
+  replicaCount: 1
+  resources:
+    requests:
+      memory: 200Mi
+      cpu: 350m
+    limits:
+      memory: 400Mi
+      cpu: 1000m
+  service:
+    clusterIP: ''
+  nodeSelector: {}
+
+# Use an external rabbitmq. This will only be used
+# if `rabbitmq.enabled` is false.
+rabbitmqExternal:
   host: rabbitmq
   port: 5672
   username: guest
@@ -113,7 +131,8 @@ sendgridEmailNotificationsKey: ''
 # directly exposed in this file.
 extraSettings: ''
 
-# Node selector will be applied to all pods for all deployments.
+# Node selector will be applied to all pods for all deployments, excluding
+# subcharts.
 nodeSelector: {}
 
 # Deployment options (replicas, resource quotas etc).