Merge branch 'master' into k8s-mariadb-check

.lagoon.yml

@@ -59,10 +59,6 @@ environments:
         schedule: '*/30 * * * *'
         command: /idle-services.sh
         service: auto-idler
-      - name: curator
-        schedule: '01 0 * * * '
-        command: /lagoon/cronjob.sh "/usr/bin/curator --config /curator/curator.yml /curator/actions.yml"
-        service: logs-db-curator
   develop:
     types:
       logs-db: elasticsearch-cluster

Jenkinsfile

@@ -26,7 +26,7 @@ node {
         // See `man -P 'less +/-O' make` for more information about this option.
         //
         // Uncomment the line below to disable output synchronisation.
-        //env.SYNC_MAKE_OUTPUT = 'none'
+        env.SYNC_MAKE_OUTPUT = 'none'
 
         stage ('env') {
           sh "env"
@@ -62,15 +62,18 @@ node {
               stage ('minishift tests') {
                 try {
                   sh 'make minishift/cleanall || echo'
-                  sh "make minishift MINISHIFT_CPUS=12 MINISHIFT_MEMORY=32GB MINISHIFT_DISK_SIZE=50GB MINISHIFT_VERSION=${minishift_version} OPENSHIFT_VERSION=${openshift_version}"
+                  sh "make minishift MINISHIFT_CPUS=16 MINISHIFT_MEMORY=32GB MINISHIFT_DISK_SIZE=50GB MINISHIFT_VERSION=${minishift_version} OPENSHIFT_VERSION=${openshift_version}"
                   sh "make -O${SYNC_MAKE_OUTPUT} push-minishift -j5"
-                  sh "make -O${SYNC_MAKE_OUTPUT} openshift-tests -j2"
+                  sh "make -O${SYNC_MAKE_OUTPUT} openshift-tests -j7"
                 } catch (e) {
                   echo "Something went wrong, trying to cleanup"
                   cleanup()
                   throw e
                 }
               }
+              stage ('cleanup') {
+                cleanup()
+              }
             },
             '2 start services': {
               stage ('start services') {
@@ -139,11 +142,11 @@ node {
 
 def cleanup() {
   try {
+    sh "make minishift/cleanall"
+    sh "make k3d/cleanall"
     sh "make down || true"
     sh "make kill"
     sh "make down"
-    sh "make minishift/cleanall"
-    sh "make k3d/cleanall"
     sh "make clean"
   } catch (error) {
     echo "cleanup failed, ignoring this."

Makefile

@@ -423,6 +423,7 @@ services :=       api \
 									kubernetesremove \
 									webhook-handler \
 									webhooks2tasks \
+									backup-handler \
 									broker \
 									broker-single \
 									logs-forwarder \
@@ -470,7 +471,7 @@ $(build-services-galera):
 	touch $@
 
 # Dependencies of Service Images
-build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2microsoftteams build/openshiftbuilddeploy build/openshiftbuilddeploymonitor build/openshiftjobs build/openshiftjobsmonitor build/openshiftmisc build/openshiftremove build/kubernetesbuilddeploy build/kubernetesdeployqueue build/kubernetesbuilddeploymonitor build/kubernetesjobs build/kubernetesjobsmonitor build/kubernetesmisc build/kubernetesremove build/webhook-handler build/webhooks2tasks build/api build/cli build/ui: build/yarn-workspace-builder
+build/auth-server build/logs2email build/logs2slack build/logs2rocketchat build/logs2microsoftteams build/openshiftbuilddeploy build/openshiftbuilddeploymonitor build/openshiftjobs build/openshiftjobsmonitor build/openshiftmisc build/openshiftremove build/backup-handler build/kubernetesbuilddeploy build/kubernetesdeployqueue build/kubernetesbuilddeploymonitor build/kubernetesjobs build/kubernetesjobsmonitor build/kubernetesmisc build/kubernetesremove build/webhook-handler build/webhooks2tasks build/api build/cli build/ui: build/yarn-workspace-builder
 build/logs2logs-db: build/logstash__7
 build/logs-db: build/elasticsearch__7.1
 build/logs-db-ui: build/kibana__7.1
@@ -616,7 +617,7 @@ openshift-test-services = openshiftremove openshiftbuilddeploy openshiftbuilddep
 kubernetes-test-services = kubernetesbuilddeploy kubernetesdeployqueue kubernetesbuilddeploymonitor kubernetesjobs kubernetesjobsmonitor kubernetesremove kubernetesmisc tests-kubernetes local-registry local-dbaas-provider drush-alias
 
 # List of Lagoon Services needed for webhook endpoint testing
-webhooks-test-services = webhook-handler webhooks2tasks
+webhooks-test-services = webhook-handler webhooks2tasks backup-handler
 
 # List of Lagoon Services needed for drupal testing
 drupal-test-services = drush-alias

docker-compose.yaml

@@ -38,6 +38,17 @@ services:
       lagoon.type: custom
       lagoon.template: services/webhook-handler/.lagoon.app.yml
       lagoon.image: amazeeiolagoon/webhook-handler:kubernetes
+  backup-handler:
+    image: ${IMAGE_REPO:-lagoon}/backup-handler
+    restart: on-failure
+    ports:
+      - '7778:3000'
+    labels:
+      lagoon.type: custom
+      lagoon.template: services/backup-handler/.lagoon.app.yml
+      lagoon.image: amazeeiolagoon/backup-handler:kubernetes
+    depends_on:
+      - broker
   broker:
     image: ${IMAGE_REPO:-lagoon}/broker-single
     ports:
@@ -449,18 +460,6 @@ services:
       - '5000:5000'
     labels:
       lagoon.type: none
-  local-dbaas-provider:
-    image: ${IMAGE_REPO:-lagoon}/local-dbaas-provider
-    restart: always
-    labels:
-      lagoon.type: none
-    environment:
-      MYSQL_DATABASE: 'db'
-      MYSQL_USER: 'user'
-      MYSQL_PASSWORD: 'password'
-      MYSQL_ROOT_PASSWORD: 'password'
-    ports:
-      - '3306:3306'
   drush-alias:
     image: ${IMAGE_REPO:-lagoon}/drush-alias
     volumes:
@@ -731,8 +730,6 @@ services:
   harbor-redis:
     image: ${IMAGE_REPO:-lagoon}/harbor-redis
     hostname: harbor-redis
-    ports:
-      - '6379:6379'
     volumes:
       - /var/lib/redis
     labels: