test(storage): swap seaweedfs upstream image for cryostat-storage

smoketest.bash

@@ -146,8 +146,6 @@ cleanup() {
         down "${downFlags[@]}"
     ${container_engine} rm proxy_cfg_helper || true
     ${container_engine} volume rm auth_proxy_cfg || true
-    ${container_engine} rm seaweed_cfg_helper || true
-    ${container_engine} volume rm seaweed_cfg || true
     # podman kill hoster || true
     truncate -s 0 "${HOSTSFILE}"
     for i in "${PIDS[@]}"; do
@@ -172,15 +170,6 @@ if [ "${USE_PROXY}" = "true" ]; then
     createProxyCfgVolume
 fi
 
-createSeaweedConfigVolume() {
-    "${container_engine}" volume create seaweed_cfg
-    "${container_engine}" container create --name seaweed_cfg_helper -v seaweed_cfg:/tmp busybox
-    "${container_engine}" cp "${DIR}/smoketest/compose/seaweed_cfg.json" seaweed_cfg_helper:/tmp/seaweed_cfg.json
-}
-if [ "${s3}" = "seaweed" ]; then
-    createSeaweedConfigVolume
-fi
-
 setupUserHosts() {
     # FIXME this is broken: it puts the containers' bridge-internal IP addresses
     # into the user hosts file, but these IPs are in a subnet not reachable from the host.

smoketest/compose/s3-cloudserver.yml

@@ -10,8 +10,6 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: accessKey1
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: verySecretKey1
-      AWS_ACCESS_KEY_ID: accessKey1
-      AWS_SECRET_ACCESS_KEY: verySecretKey1
   s3:
     image: ${CLOUDSERVER_IMAGE:-docker.io/zenko/cloudserver:latest}
     hostname: s3

smoketest/compose/s3-localstack.yml

@@ -10,8 +10,6 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: unused
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: unused
-      AWS_ACCESS_KEY_ID: unused
-      AWS_SECRET_ACCESS_KEY: unused
   s3:
     image: ${LOCALSTACK_IMAGE:-docker.io/localstack/localstack:latest}
     hostname: s3

smoketest/compose/s3-minio.yml

@@ -10,8 +10,6 @@ services:
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: minioroot
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: minioroot
-      AWS_ACCESS_KEY_ID: minioroot
-      AWS_SECRET_ACCESS_KEY: minioroot
   s3:
     image: ${MINIO_IMAGE:-docker.io/minio/minio:latest}
     hostname: s3

smoketest/compose/s3-seaweed.yml

@@ -3,25 +3,28 @@ services:
   cryostat:
     environment:
       STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
+      CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8333
       STORAGE_EXT_URL: http://localhost:8080/storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
       QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: access_key
       QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: secret_key
-      AWS_ACCESS_KEY_ID: access_key
-      AWS_SECRET_ACCESS_KEY: secret_key
   s3:
-    image: ${SEAWEEDFS_IMAGE:-docker.io/chrislusf/seaweedfs:latest}
+    image: ${STORAGE_IMAGE:-quay.io/cryostat/cryostat-storage:latest}
     hostname: s3
-    command: server -dir=/data -s3 -s3.config=/opt/seaweed_cfg.json
     environment:
+      CRYOSTAT_BUCKETS: archivedrecordings,archivedreports
+      CRYOSTAT_ACCESS_KEY: access_key
+      CRYOSTAT_SECRET_KEY: secret_key
+      DATA_DIR: /data
       IP_BIND: 0.0.0.0
       WEED_V: '4' # glog logging level
     volumes:
       - seaweed_data:/data
-      - seaweed_cfg:/opt
+    ports:
+      - "8888:8888"
     expose:
       - "8333"
     labels:
@@ -30,10 +33,11 @@ services:
     healthcheck:
       test:
         - CMD-SHELL
-        - wget
-        - --tries=1
-        - --spider
-        - http://s3:8333/
+        - timeout
+        - 5s
+        - bash
+        - -c
+        - :> /dev/tcp/127.0.0.1/8333
       interval: 10s
       retries: 3
       start_period: 30s
@@ -42,5 +46,3 @@ services:
 volumes:
   seaweed_data:
     driver: local
-  seaweed_cfg:
-    external: true