fix agent-based deployment

Signed-off-by: Artem Torubarov <[email protected]>

Author: arttor

deploy/chorus/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 name: chorus
 description: Helm chart for Chorus S3 management software.
-keywords: ["S3","Backup","Replication","Migration"]
+keywords: ["S3", "Backup", "Replication", "Migration"]
 home: https://github.com/clyso/chorus
 type: application
 version: 0.1.2
 appVersion: "v0.5.14"
 dependencies:
   - name: redis
-    version: 17.11.3
+    version: 23.1.3
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled

deploy/chorus/charts/redis-17.11.3.tgz

@@ -38,6 +38,10 @@ spec:
               name: redis-secret
         - name: CFG_REDIS_ADDRESS
           value: {{ printf "%s-redis-master:6379" ( .Release.Name ) }}
+        {{- if empty .Values.agent.config.url }}
+        - name: CFG_URL
+          value: {{ printf "http://%s-agent.%s.svc.cluster.local:9672" (include "chorus.fullname" . ) ( .Release.Namespace  ) | quote }}
+        {{- end }}
         image: {{ .Values.agent.image.repository }}:{{ .Values.agent.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
         name: agent

deploy/chorus/charts/redis-23.1.3.tgz

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "chorus.fullname" . }}-agent-service
+  name: {{ include "chorus.fullname" . }}-agent
   labels:
     app: agent
   {{- include "chorus.labels" . | nindent 4 }}

deploy/chorus/templates/agent/deployment-agent.yaml

@@ -72,7 +72,7 @@ spec:
           name: secret
           subPath: config
         {{- end }}
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 60
       volumes:
       - configMap:
           name: {{ include "chorus.fullname" . }}-proxy
@@ -82,4 +82,4 @@ spec:
           secretName: {{ .Values.existingSecret | default (printf "%s-secret" (include "chorus.fullname" . ) ) }}
         name: secret
       {{- end }}
-{{- end }}
+{{- end }}

deploy/chorus/templates/agent/service-agent.yaml

@@ -29,7 +29,7 @@ spec:
         imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
         env:
         - name: BACKEND_URL
-          value: {{ printf "http://%s-rest:%d" .Release.Name ( .Values.worker.restApiService.portRest.port | int) | quote }}
+          value: {{ printf "http://%s-rest:%d" (include "chorus.fullname" . ) ( .Values.worker.restApiService.portRest.port | int) | quote }}
         ports:
         - containerPort: 80
           name: http

deploy/chorus/templates/proxy/deployment-proxy.yaml

@@ -6,12 +6,12 @@ proxy:
     pullPolicy: Always
   replicas: 2
   resources:
-    limits:
-      cpu: 100m
-      memory: 300Mi
-    requests:
-      cpu: 50m
-      memory: 150Mi
+    # limits:
+    #   cpu: 100m
+    #   memory: 300Mi
+    # requests:
+    #   cpu: 50m
+    #   memory: 150Mi
   proxyService:
     portHttp:
       port: 9669
@@ -49,12 +49,12 @@ worker:
     tag: "" # Chart appVersion will be used if empty
     pullPolicy: Always
   resources:
-    limits:
-      cpu: 100m
-      memory: 300Mi
-    requests:
-      cpu: 50m
-      memory: 150Mi
+    # limits:
+    #   cpu: 100m
+    #   memory: 300Mi
+    # requests:
+    #   cpu: 50m
+    #   memory: 150Mi
   restApiService:
     portRest:
       port: 9671
@@ -76,7 +76,7 @@ worker:
       endpoint: # url to Jaeger or other open trace provider
     rclone:
       memoryLimit:
-        enabled: true
+        enabled: false
         limit: 300M # Max RAM memory for file copy. Possible values: 50M <= mem <= (total app RAM - 50M). More memory -> faster s3 replication. # For example: if worker container resources.memory.limit = 500M, then mem = 450M
         retryMin: 2s
         retryMax: 20s
@@ -89,7 +89,7 @@ worker:
         retryMin: 2s
         retryMax: 20s
       globalFileLimit:
-        enabled: true
+        enabled: false
         limit: 3
         retryMin: 2s
         retryMax: 20s
@@ -120,8 +120,6 @@ commonConfig:
     tagging: true
     acl: true
   storage:
-    createRouting: true # create roting rules to route proxy requests to main storage
-    createReplication: false # create replication rules to replicate data from main to other storages
     defaultRegion: "us-east-1" # fallback region. Will be used if origin region is not supported by replication destination
     storages:
       # one:
@@ -164,8 +162,12 @@ agent:
       enabled: false
       endpoint: # url to Jaeger or other open trace provider
     port: 9673 # agent port to listen incoming notifications
-    url: http://localhost:9673 # REQUIRED: url to be used by s3 storage to send notifications. The URL should be reachable for s3 storage.
-    fromStorage: "" # REQUIRED: notifications source storage name from Chorus config. Normally name of the main storage from storage config.
+    # REQUIRED: url to be used by s3 storage to send notifications. The URL should be reachable for s3 storage.
+    # set empty to use k8s service URL if fromStorage is in the same k8s cluster
+    # http://<helm_release>-agent.<release_ns>.svc.cluster.local:9672
+    url: ""
+    # REQUIRED: notifications source storage name from Chorus config. Normally name of the main storage from storage config.
+    fromStorage: ""
 existingSecret: "" # set name of existing secret with storage credentials or
 secret: "" #  set storage credentials here to create secret:
 # Example
@@ -199,6 +201,22 @@ secret: "" #  set storage credentials here to create secret:
 redis:
   enabled: true
   architecture: standalone
+  # uncomment to enable redis persistence. Required for production setup
+  #   master:
+  #     persistence:
+  #       enabled: true
+  #       size: 64Gi # conservative estimate
+  #       storageClass: "" # Use default storage class or specify (e.g., "gp2")
+  #   reesources: {} # Redis requests/limits.
+  #   commonConfiguration: |-
+  #     appendonly yes
+  #     appendfsync everysec
+  #   metrics: # enable redis metrics
+  #     enabled: true
+  #     serviceMonitor:
+  #       enabled: true
+  #       additionalLabels:
+  #         release: kube-prometheus-stack
   auth:
     existingSecret: redis-secret
     existingSecretPasswordKey: password

deploy/chorus/templates/ui/deployment.yaml

@@ -1,6 +1,4 @@
 storage:
-  createRouting: true # create roting rules to route proxy requests to main storage
-  createReplication: false # create replication rules to replicate data from main to other storages
   defaultRegion: "us-east-1" # fallback region. Will be used if origin region is not supported by replication destination
   storages:
     main: # yaml key with some handy storage name

deploy/chorus/values.yaml

@@ -7,9 +7,9 @@ replace github.com/hibiken/asynq => github.com/clyso/asynq v0.0.0-20250821155534
 require (
 	github.com/alicebob/miniredis/v2 v2.35.0
 	github.com/aws/aws-sdk-go v1.55.7
-	github.com/aws/aws-sdk-go-v2 v1.37.2
-	github.com/aws/aws-sdk-go-v2/credentials v1.18.3
-	github.com/aws/aws-sdk-go-v2/service/sns v1.22.2
+	github.com/aws/aws-sdk-go-v2 v1.39.2
+	github.com/aws/aws-sdk-go-v2/credentials v1.18.16
+	github.com/aws/aws-sdk-go-v2/service/sns v1.38.5
 	github.com/bsm/redislock v0.9.4
 	github.com/go-redis/redis_rate/v10 v10.0.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -111,23 +111,23 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/ashanbrown/forbidigo/v2 v2.1.0 // indirect
 	github.com/ashanbrown/makezero/v2 v2.0.1 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.30.3 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.2 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.2 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.31.12 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.12 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.86.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.27.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.32.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.36.0 // indirect
-	github.com/aws/smithy-go v1.22.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.88.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect
+	github.com/aws/smithy-go v1.23.0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.3 // indirect