fix: update to s3 collector with fixes

trustification · Oct 10, 2023 · 115c48b · 115c48b
1 parent 6af56ad
commit 115c48b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/deploy/compose/.env b/deploy/compose/.env
@@ -13,8 +13,7 @@ COLLECTORIST_API_PORT=8180
 COLLECTOR_OSV_API_PORT=8181
 COLLECTOR_SNYK_API_PORT=8182
 COLLECTOR_NVD_API_PORT=8183
-
-GUAC_IMAGE=quay.io/redhat-user-workloads/trusted-content-tenant/trustification/trustification-guac:75f5c6c00e0768054f1eb12c138cbfad65099eed
+GUAC_IMAGE=ghcr.io/trustification/guac:v0.2.5-s3fix
 #GUAC_IMAGE=local-organic-guac
 
 CHROMEDRIVER_IMAGE=docker.io/selenium/standalone-chrome:117.0
diff --git a/deploy/compose/compose-guac.yaml b/deploy/compose/compose-guac.yaml
@@ -52,7 +52,8 @@ services:
 
   bombastic-collector:
     image: $GUAC_IMAGE
-    command: "/opt/guac/guacone collect s3 --poll --s3-mp kafka --s3-region eu-west-1 --s3-queues sbom-indexed --s3-mp-host kafka --s3-mp-port 9094 --gql-addr http://guac-graphql:$GUAC_API_PORT/query --csub-addr guac-collectsub:$GUAC_CSUB_PORT minio 9000"
+    command: "/opt/guac/guacone collect s3 --poll --s3-mp kafka --s3-url http://minio:9000 --s3-bucket bombastic --s3-queues sbom-indexed --s3-mp-endpoint kafka:9094 --gql-addr http://guac-graphql:$GUAC_API_PORT/query --csub-addr guac-collectsub:$GUAC_CSUB_PORT"
     environment:
       AWS_ACCESS_KEY_ID: admin
       AWS_SECRET_ACCESS_KEY: password
+      AWS_REGION: eu-west-1
diff --git a/deploy/k8s/chart/templates/bombastic/collector/030-Deployment.yaml b/deploy/k8s/chart/templates/bombastic/collector/030-Deployment.yaml
@@ -38,18 +38,12 @@ spec:
             - "collect"
             - "s3"
             - "--poll"
+            - "--s3-bucket"
+            - "{{ .Values.bombastic.bucket }}"
             - "--s3-mp"
             - "sqs"
-            - "--s3-region"
-            - "{{ .Values.region }}"
             - "--s3-queues"
             - "{{ .Values.bombastic.collector.queue }}"
-            - "--s3-mp-host"
-            - "sqs.{{ .Values.region }}.amazonaws.com"
-            - "--s3-mp-port"
-            - "443"
-            - "{{ .Values.bombastic.bucket }}.s3.amazonaws.com"
-            - "443"
           workingDir: "/guac"
           env:
             - name: NAMESPACE

diff --git a/deploy/trustification.dev/prod.yaml b/deploy/trustification.dev/prod.yaml
@@ -3,7 +3,7 @@ trustImage: ghcr.io/trustification/trust
 uiImage: ghcr.io/trustification/trust-ui
 docsImage: ghcr.io/trustification/trust-docs
 testsImage: ghcr.io/trustification/trust-tests
-guacImage: ghcr.io/trustification/guac:v0.2.1-s3fix
+guacImage: ghcr.io/trustification/guac:v0.2.5-s3fix
 domain: trustification.dev
 replicas: 2
 imagePullPolicy: IfNotPresent

diff --git a/deploy/trustification.dev/staging.yaml b/deploy/trustification.dev/staging.yaml
@@ -3,7 +3,7 @@ trustImage: ghcr.io/trustification/trust
 uiImage: ghcr.io/trustification/trust-ui
 docsImage: ghcr.io/trustification/trust-docs
 testsImage: ghcr.io/trustification/trust-tests
-guacImage: ghcr.io/trustification/guac:v0.2.1-s3fix
+guacImage: ghcr.io/trustification/guac:v0.2.5-s3fix
 domain: staging.trustification.dev
 replicas: 1
 imagePullPolicy: IfNotPresent