Merge pull request #3591 from uselagoon/testing/DWP_updates

Update the data in the data-watcher-pusher, and rejig the process slightly

Makefile

@@ -358,15 +358,15 @@ ui-logs-development: build-ui-logs-development
 
 ## CI targets
 
-KUBECTL_VERSION := v1.26.6
-HELM_VERSION := v3.12.2
-K3D_VERSION = v5.5.1
+KUBECTL_VERSION := v1.27.3
+HELM_VERSION := v3.13.1
+K3D_VERSION = v5.6.0
 GOJQ_VERSION = v0.12.13
 STERN_VERSION = v2.6.1
-CHART_TESTING_VERSION = v3.9.0
-K3D_IMAGE = docker.io/rancher/k3s:v1.26.6-k3s1
+CHART_TESTING_VERSION = v3.10.1
+K3D_IMAGE = docker.io/rancher/k3s:v1.27.3-k3s1
 TESTS = [nginx,api,features-kubernetes,bulk-deployment,features-kubernetes-2,features-variables,active-standby-kubernetes,tasks,drush,python,gitlab,github,bitbucket,services,workflows]
-CHARTS_TREEISH = main
+CHARTS_TREEISH = prerelease/lagoon_v217
 TASK_IMAGES = task-activestandby
 
 # Symlink the installed kubectl client if the correct version is already

docker-compose.yaml

@@ -210,7 +210,6 @@ services:
       - api
     image: ${IMAGE_REPO:-lagoon}/local-api-data-watcher-pusher
     volumes:
-      - ./local-dev/api-data:/api-data
       - ./local-dev/api-data-watcher-pusher:/home
   local-dbaas-provider:
     image: ${IMAGE_REPO:-lagoon}/local-dbaas-provider
@@ -237,20 +236,6 @@ services:
     environment:
       - MINIO_ROOT_USER=minio
       - MINIO_ROOT_PASSWORD=minio123
-    volumes:
-      - minio_storage:/export
-  local-minio-upload:
-    image: minio/mc
-    entrypoint: sh
-    command: -c 'mc alias set localminio $${MINIO_SERVER_URL} $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; mc ls localminio; mc cp /restores/files.tar.gz localminio/restores/high-cotton-master-files.tar.gz'
-    volumes:
-      - ./local-dev/restores:/restores
-    environment:
-      - MINIO_SERVER_URL=http://172.17.0.1:9000
-      - MINIO_ROOT_USER=minio
-      - MINIO_ROOT_PASSWORD=minio123
-    depends_on:
-      - local-minio
   local-registry:
     image: ${IMAGE_REPO:-lagoon}/local-registry
     ports:
@@ -263,6 +248,3 @@ services:
       version: '2'
   api-redis:
     image: ${IMAGE_REPO:-lagoon}/api-redis
-
-volumes:
-  minio_storage: {}

local-dev/api-data-watcher-pusher/Dockerfile

@@ -1,7 +1,10 @@
-FROM alpine:3.17.1
+FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest}
+
 RUN apk add --no-cache \
       bash \
+      curl \
       gettext \
+      minio-client \
       moreutils \
       py3-jwt \
       tini \
@@ -15,7 +18,8 @@ ENV JWTSECRET=super-secret-string \
     INGRESS_IP="172.17.0.1" \
     TOKEN="eyJhbGciOiJSUzI1NiIsImtpZCI6IjZWamZLTzEzZ2lPSGFtc0d6QXVkWXpDYi1fcmlfLWVBd3JtbEEydGItTHcifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJsYWdvb24iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlY3JldC5uYW1lIjoia3ViZXJuZXRlc2J1aWxkZGVwbG95LXRva2VuLXJxNDg1Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6Imt1YmVybmV0ZXNidWlsZGRlcGxveSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50LnVpZCI6IjA3YzViODAxLTI5ZDgtNDU5Ni1hODBlLTZlMmU3MmY3YmMwMCIsInN1YiI6InN5c3RlbTpzZXJ2aWNlYWNjb3VudDpsYWdvb246a3ViZXJuZXRlc2J1aWxkZGVwbG95In0.srj-zZguNXCQbeTIS5GtJw7Jl61k_miC8hXED70NQULm6OAMkImHrURRCfD4kjKPy-jbwEI88m5TNLFP8_0sMfdwj2vr2Gv8fTC55qoAJ589ff_dwv8THSKdKNj6VaHynzEzQ4IfZscd3ogP4HYF9alt-X4mMcJ2BApBt4F13Hg-bE2-4uzO0b_u13pJhzn0XrH8JGXWP0_oMPtE7M0zJL9BfOrBph_MgSb2djSbVBNbhPJ0fs9-eIB5aAu0NmqPhpxj6WL4UOAKX178IsDAq4vtRZrScZwvZxRcaDUxZ-MgwewWI8Ll0yg7UCxtZTdkLglkCgpjTK33Ei0PXWdE4A"
 
-COPY api-data /api-data
-COPY api-watch-push.sh create_jwt.py /home/
+COPY api-data /home/api-data
+COPY minio-data /home/minio-data
+COPY data-init-push.sh create_jwt.py /home/
 
-CMD ["tini", "--", "/home/api-watch-push.sh"]
+CMD ["/sbin/tini", "--", "/home/data-init-push.sh"]