From 59c6905969454a4de14cb790b11266f222aefa96 Mon Sep 17 00:00:00 2001
From: ausias-armesto <ausiasarmesto@gmail.com>
Date: Fri, 3 May 2024 16:10:30 +0200
Subject: [PATCH] Move the repository into the correct child (#510)

* Move the repository into the correct child

* Fixing secret rabbitMQ
---
 helm/ctdapp/templates/secret-rabbitmq.yaml | 19 ++++++++++++++++---
 helm/ctdapp/values.yaml                    | 15 ++++++---------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/helm/ctdapp/templates/secret-rabbitmq.yaml b/helm/ctdapp/templates/secret-rabbitmq.yaml
index 80d526d4..dd76c824 100644
--- a/helm/ctdapp/templates/secret-rabbitmq.yaml
+++ b/helm/ctdapp/templates/secret-rabbitmq.yaml
@@ -1,9 +1,22 @@
+---
 apiVersion: v1
 kind: Secret
 metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: "1"
-    replicator.v1.mittwald.de/replicate-to: rabbitmq
+  name: rabbitmq-ctdapp
+  namespace: ctdapp
+data:
+    CELERY_BROKER_URL: {{ .Values.ctdapp.rabbitmq.celeryBrokerUrl | b64enc }}
+    RABBITMQ_HOST: {{ .Values.ctdapp.rabbitmq.host | b64enc }}
+    RABBITMQ_PASSWORD: {{ .Values.ctdapp.rabbitmq.password | b64enc }}
+    RABBITMQ_USERNAME: {{ .Values.ctdapp.rabbitmq.username | b64enc }}
+    RABBITMQ_VIRTUALHOST: {{ .Values.ctdapp.rabbitmq.virtualhost | b64enc }}
+    password: {{ .Values.ctdapp.rabbitmq.password | b64enc }}
+    username: {{ .Values.ctdapp.rabbitmq.username | b64enc }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  anamespace: rabbitmq
   name: rabbitmq-ctdapp
 data:
     CELERY_BROKER_URL: {{ .Values.ctdapp.rabbitmq.celeryBrokerUrl | b64enc }}
diff --git a/helm/ctdapp/values.yaml b/helm/ctdapp/values.yaml
index ec207296..600576e3 100644
--- a/helm/ctdapp/values.yaml
+++ b/helm/ctdapp/values.yaml
@@ -1,13 +1,5 @@
 environmentName: ""
 ctdapp:
-  core:
-    repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic
-    pullPolicy: Always
-    tag: f65697a
-  postman:
-    repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic
-    pullPolicy: Always
-    tag: f65697a
 
   nameOverride: ""
   fullnameOverride: ""
@@ -33,6 +25,9 @@ ctdapp:
 
 
   core:
+    repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic
+    pullPolicy: Always
+    tag: ""
     replicas: 1
     extraEnvVars: {}
     resources:
@@ -42,8 +37,10 @@ ctdapp:
       requests:
         cpu: 250m
         memory: 256Mi
-
   postman:
+    repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic
+    pullPolicy: Always
+    tag: ""
     replicas: 1
     extraEnvVars: {}
     resources: