743 rabbitmq cluster

Makefile

@@ -118,6 +118,8 @@ images :=     oc \
 							varnish-drupal \
 							redis \
 							redis-persistent \
+							rabbitmq \
+							rabbitmq-cluster \
 							mongo \
 							elasticsearch \
 							kibana \
@@ -161,6 +163,8 @@ build/varnish: build/commons images/varnish/Dockerfile
 build/varnish-drupal: build/varnish images/varnish-drupal/Dockerfile
 build/redis: build/commons images/redis/Dockerfile
 build/redis-persistent: build/redis images/redis-persistent/Dockerfile
+build/rabbitmq: build/commons images/rabbitmq/Dockerfile
+build/rabbitmq-cluster: build/rabbitmq images/rabbitmq-cluster/Dockerfile
 build/mongo: build/commons images/mongo/Dockerfile
 build/elasticsearch: build/commons images/elasticsearch/Dockerfile
 build/logstash: build/commons images/logstash/Dockerfile
@@ -328,7 +332,7 @@ services :=       api \
 									rest2tasks \
 									webhook-handler \
 									webhooks2tasks \
-									rabbitmq \
+									broker \
 									logs-forwarder \
 									logs-db \
 									logs-db-ui \
@@ -453,7 +457,7 @@ tests-list:
 #### Definition of tests
 
 # Define a list of which Lagoon Services are needed for running any deployment testing
-deployment-test-services-main = rabbitmq openshiftremove openshiftbuilddeploy openshiftbuilddeploymonitor logs2slack logs2rocketchat api ssh auth-server local-git local-api-data-watcher-pusher tests
+deployment-test-services-main = broker openshiftremove openshiftbuilddeploy openshiftbuilddeploymonitor logs2slack logs2rocketchat api ssh auth-server local-git local-api-data-watcher-pusher tests
 
 # All Tests that use REST endpoints
 rest-tests = rest node features nginx elasticsearch

docker-compose.yaml

@@ -38,15 +38,15 @@ services:
       lagoon.type: custom
       lagoon.template: services/webhook-handler/.lagoon.app.yml
       lagoon.image: amazeeiolagoon/webhook-handler:${SAFE_BRANCH:-master}
-  rabbitmq:
-    image: ${IMAGE_REPO:-lagoon}/rabbitmq
+  broker:
+    image: ${IMAGE_REPO:-lagoon}/broker
     ports:
       - '15672:15672'
       - '5672:5672'
     labels:
-      lagoon.type: custom
-      lagoon.template: services/rabbitmq/.lagoon.app.yml
-      lagoon.image: amazeeiolagoon/rabbitmq:${SAFE_BRANCH:-master}
+      lagoon.type: rabbitmq-cluster
+      lagoon.template: services/broker/.lagoon.app.yml
+      lagoon.image: amazeeiolagoon/broker:${SAFE_BRANCH:-master}
   openshiftremove:
     image: ${IMAGE_REPO:-lagoon}/openshiftremove
     command: yarn run dev

images/oc-build-deploy-dind/openshift-templates/rabbitmq-cluster/services.yml

@@ -0,0 +1,68 @@
+---
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: lagoon-openshift-template-node
+parameters:
+  - name: SERVICE_NAME
+    description: Name of this service
+    required: true
+  - name: SAFE_BRANCH
+    description: Which branch this belongs to, special chars replaced with dashes
+    required: true
+  - name: SAFE_PROJECT
+    description: Which project this belongs to, special chars replaced with dashes
+    required: true
+  - name: BRANCH
+    description: Which branch this belongs to, original value
+    required: true
+  - name: PROJECT
+    description: Which project this belongs to, original value
+    required: true
+  - name: LAGOON_GIT_SHA
+    description: git hash sha of the current deployment
+    required: true
+  - name: SERVICE_ROUTER_URL
+    description: URL of the Router for this service
+    value: ""
+  - name: OPENSHIFT_PROJECT
+    description: Name of the Project that this service is in
+    required: true
+  - name: REGISTRY
+    description: Registry where Images are pushed to
+    required: true
+  - name: DEPLOYMENT_STRATEGY
+    description: Strategy of Deploymentconfig
+    value: "Rolling"
+  - name: SERVICE_IMAGE
+    description: Pullable image of service
+    required: true
+  - name: CRONJOBS
+    description: Oneliner of Cronjobs
+    value: ""
+objects:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    creationTimestamp: null
+    labels:
+      service: ${SERVICE_NAME}
+      branch: ${SAFE_BRANCH}
+      project: ${SAFE_PROJECT}
+    name: ${SERVICE_NAME}
+  spec:
+    clusterIP: None
+    ports:
+    - name: 15672-tcp
+      port: 15672
+      protocol: TCP
+      targetPort: 15672
+    - name: 5672-tcp
+      port: 5672
+      protocol: TCP
+      targetPort: 5672
+    selector:
+      service: ${SERVICE_NAME}
+  status:
+    loadBalancer: {}

images/oc-build-deploy-dind/openshift-templates/rabbitmq-cluster/statefulset.yml

@@ -0,0 +1,131 @@
+---
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: lagoon-openshift-template-node
+parameters:
+  - name: SERVICE_NAME
+    description: Name of this service
+    required: true
+  - name: SAFE_BRANCH
+    description: Which branch this belongs to, special chars replaced with dashes
+    required: true
+  - name: SAFE_PROJECT
+    description: Which project this belongs to, special chars replaced with dashes
+    required: true
+  - name: BRANCH
+    description: Which branch this belongs to, original value
+    required: true
+  - name: PROJECT
+    description: Which project this belongs to, original value
+    required: true
+  - name: LAGOON_GIT_SHA
+    description: git hash sha of the current deployment
+    required: true
+  - name: SERVICE_ROUTER_URL
+    description: URL of the Router for this service
+    value: ""
+  - name: OPENSHIFT_PROJECT
+    description: Name of the Project that this service is in
+    required: true
+  - name: REGISTRY
+    description: Registry where Images are pushed to
+    required: true
+  - name: DEPLOYMENT_STRATEGY
+    description: Strategy of Deploymentconfig
+    value: "Rolling"
+  - name: SERVICE_IMAGE
+    description: Pullable image of service
+    required: true
+  - name: CRONJOBS
+    description: Oneliner of Cronjobs
+    value: ""
+objects:
+- apiVersion: v1
+  kind: ServiceAccount
+  metadata:
+    name: ${SERVICE_NAME}-sa
+- apiVersion: v1
+  kind: RoleBinding
+  metadata:
+    name: ${SERVICE_NAME}-view
+  roleRef:
+    kind: Role
+    name: view
+  subjects:
+  - kind: ServiceAccount
+    name: ${SERVICE_NAME}-sa
+- apiVersion: apps/v1beta1
+  kind: StatefulSet
+  metadata:
+    name: ${SERVICE_NAME}
+  spec:
+    serviceName: ${SERVICE_NAME}
+    replicas: 3
+    selector:
+      matchLabels:
+        service: ${SERVICE_NAME}
+    template:
+      metadata:
+        labels:
+          branch: ${SAFE_BRANCH}
+          project: ${SAFE_PROJECT}
+          service: ${SERVICE_NAME}
+      spec:
+        serviceAccountName: ${SERVICE_NAME}-sa
+        affinity:
+         podAntiAffinity:
+           requiredDuringSchedulingIgnoredDuringExecution:
+             - labelSelector:
+                 matchExpressions:
+                   - key: service
+                     operator: In
+                     values:
+                       - ${SERVICE_NAME}
+               topologyKey: kubernetes.io/hostname
+        containers:
+        - name: ${SERVICE_NAME}
+          command:
+            - sh
+          args:
+            - /cluster-rabbit.sh
+          image: ${SERVICE_IMAGE}
+          imagePullPolicy: Always
+          ports:
+          - containerPort: 4369
+            protocol: TCP
+          - containerPort: 15672
+            protocol: TCP
+          - containerPort: 5672
+            protocol: TCP
+          readinessProbe:
+            tcpSocket:
+              port: 5672
+            initialDelaySeconds: 15
+            timeoutSeconds: 1
+          volumeMounts:
+            - name: ${SERVICE_NAME}
+              mountPath: /var/lib/rabbitmq
+          env:
+            - name: RABBITMQ_USE_LONGNAME
+              value: "true"
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.namespace
+            - name: SERVICE_NAME
+              value: ${SERVICE_NAME}
+            - name: CRONJOBS
+              value: ${CRONJOBS}
+    volumeClaimTemplates:
+    - metadata:
+        name: ${SERVICE_NAME}
+      spec:
+        accessModes: [ "ReadWriteOnce" ]
+        resources:
+          requests:
+            storage: 5Gi
+    updateStrategy:
+      type: RollingUpdate

services/rabbitmq/.lagoon.app.yml → images/oc-build-deploy-dind/openshift-templates/rabbitmq/deployment.yml

@@ -41,16 +41,6 @@ parameters:
     description: Oneliner of Cronjobs
     value: ""
 objects:
-- apiVersion: v1
-  kind: PersistentVolumeClaim
-  metadata:
-    name: ${SERVICE_NAME}-volume
-  spec:
-    accessModes:
-      - ReadWriteOnce
-    resources:
-      requests:
-        storage: 1Gi
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
@@ -90,20 +80,12 @@ objects:
           - configMapRef:
               name: lagoon-env
           env:
-            - name: RABBITMQ_DEFAULT_USER
-              valueFrom:
-                secretKeyRef:
-                  name: rabbitmq-username
-                  key: RABBITMQ_USERNAME
-            - name: RABBITMQ_DEFAULT_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: rabbitmq-password
-                  key: RABBITMQ_PASSWORD
             - name: SERVICE_NAME
               value: ${SERVICE_NAME}
             - name: CRONJOBS
               value: ${CRONJOBS}
+            - name: RABBITMQ_NODENAME
+              value: rabbitmq@localhost
           resources:
             requests:
               cpu: 10m
@@ -119,42 +101,3 @@ objects:
     triggers:
     - type: ConfigChange
   status: {}
-- apiVersion: v1
-  kind: Service
-  metadata:
-    creationTimestamp: null
-    labels:
-      service: ${SERVICE_NAME}
-      branch: ${SAFE_BRANCH}
-      project: ${SAFE_PROJECT}
-    name: ${SERVICE_NAME}
-  spec:
-    ports:
-    - name: 15672-tcp
-      port: 15672
-      protocol: TCP
-      targetPort: 15672
-    - name: 5672-tcp
-      port: 5672
-      protocol: TCP
-      targetPort: 5672
-    selector:
-      service: ${SERVICE_NAME}
-  status:
-    loadBalancer: {}
-- apiVersion: v1
-  kind: Route
-  metadata:
-    creationTimestamp: null
-    labels:
-      service: ${SERVICE_NAME}
-      branch: ${SAFE_BRANCH}
-      project: ${SAFE_PROJECT}
-    name: ${SERVICE_NAME}
-  spec:
-    host: ${SERVICE_ROUTER_URL}
-    port:
-      targetPort: 15672-tcp
-    to:
-      kind: Service
-      name: ${SERVICE_NAME}

images/oc-build-deploy-dind/openshift-templates/rabbitmq/pvc.yml

@@ -0,0 +1,53 @@
+apiVersion: v1
+kind: Template
+metadata:
+  creationTimestamp: null
+  name: lagoon-openshift-template-node
+parameters:
+  - name: SERVICE_NAME
+    description: Name of this service
+    required: true
+  - name: SAFE_BRANCH
+    description: Which branch this belongs to, special chars replaced with dashes
+    required: true
+  - name: SAFE_PROJECT
+    description: Which project this belongs to, special chars replaced with dashes
+    required: true
+  - name: BRANCH
+    description: Which branch this belongs to, original value
+    required: true
+  - name: PROJECT
+    description: Which project this belongs to, original value
+    required: true
+  - name: LAGOON_GIT_SHA
+    description: git hash sha of the current deployment
+    required: true
+  - name: SERVICE_ROUTER_URL
+    description: URL of the Router for this service
+    value: ""
+  - name: OPENSHIFT_PROJECT
+    description: Name of the Project that this service is in
+    required: true
+  - name: REGISTRY
+    description: Registry where Images are pushed to
+    required: true
+  - name: DEPLOYMENT_STRATEGY
+    description: Strategy of Deploymentconfig
+    value: "Rolling"
+  - name: SERVICE_IMAGE
+    description: Pullable image of service
+    required: true
+  - name: CRONJOBS
+    description: Oneliner of Cronjobs
+    value: ""
+objects:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: ${SERVICE_NAME}-volume
+  spec:
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 1Gi