Merge pull request #94 from neicnordic/Charts_folder

Charts folder
neicnordic · Jul 27, 2021 · fc8b5e8 · fc8b5e8
2 parents 5e90007 + 70923a9
commit fc8b5e8
Show file tree

Hide file tree

Showing 91 changed files with 33 additions and 35 deletions.
diff --git a/.github/ci_tests/lint_helper.sh b/.github/ci_tests/lint_helper.sh
@@ -3,6 +3,8 @@ set -e
 
 ## create empty files so the linter won't give an false error
 
+pushd charts
+
 if [ $1 = "sda-db" ] || [ $1 = "sda-mq" ]; then
 touch $1/files/ca.crt
 touch $1/files/server.crt

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Lint sda-db
       run: |
         bash .github/ci_tests/lint_helper.sh sda-db
-        helm lint sda-db
+        helm lint charts/sda-db
 
   lint_sda-mq:
     name: Lint sda-mq
@@ -29,7 +29,7 @@ jobs:
     - name: Lint sda-mq
       run: |
         bash .github/ci_tests/lint_helper.sh sda-mq
-        helm lint sda-mq
+        helm lint charts/sda-mq
 
   lint_sda-svc:
     name: Lint sda-svc
@@ -43,7 +43,7 @@ jobs:
     - name: Lint sda-svc
       run: |
         bash .github/ci_tests/lint_helper.sh sda-svc
-        helm lint sda-svc
+        helm lint charts/sda-svc
 
   lint_sda-orch:
     name: Lint sda-orch
@@ -57,4 +57,4 @@ jobs:
     - name: Lint sda-orch
       run: |
         bash .github/ci_tests/lint_helper.sh sda-orch
-        helm lint sda-orch
+        helm lint charts/sda-orch
diff --git a/.github/workflows/manual_release.yaml b/.github/workflows/manual_release.yaml
@@ -23,7 +23,5 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.2.1
-        with:
-          charts_dir: .
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/publish_charts.yml b/.github/workflows/publish_charts.yml
@@ -27,7 +27,5 @@ jobs:
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.2.1
-        with:
-          charts_dir: .
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/sda-db/Chart.yaml → charts/sda-db/Chart.yaml b/sda-db/Chart.yaml → charts/sda-db/Chart.yaml
diff --git a/sda-db/README.md → charts/sda-db/README.md b/sda-db/README.md → charts/sda-db/README.md
diff --git a/sda-db/files/README.md → charts/sda-db/files/README.md b/sda-db/files/README.md → charts/sda-db/files/README.md
diff --git a/sda-db/templates/_helpers.tpl → charts/sda-db/templates/_helpers.tpl b/sda-db/templates/_helpers.tpl → charts/sda-db/templates/_helpers.tpl
diff --git a/sda-db/templates/networkpolicies.yaml → charts/sda-db/templates/networkpolicies.yaml b/sda-db/templates/networkpolicies.yaml → charts/sda-db/templates/networkpolicies.yaml
diff --git a/sda-db/templates/podsecuritypolicy.yaml → ...s/sda-db/templates/podsecuritypolicy.yaml b/sda-db/templates/podsecuritypolicy.yaml → ...s/sda-db/templates/podsecuritypolicy.yaml
diff --git a/sda-db/templates/release-test-deploy.yaml → ...sda-db/templates/release-test-deploy.yaml b/sda-db/templates/release-test-deploy.yaml → ...sda-db/templates/release-test-deploy.yaml
diff --git a/sda-db/templates/release-test-secrets.yaml → ...da-db/templates/release-test-secrets.yaml b/sda-db/templates/release-test-secrets.yaml → ...da-db/templates/release-test-secrets.yaml
diff --git a/sda-db/templates/secrets.yaml → charts/sda-db/templates/secrets.yaml b/sda-db/templates/secrets.yaml → charts/sda-db/templates/secrets.yaml
diff --git a/sda-db/templates/service.yaml → charts/sda-db/templates/service.yaml b/sda-db/templates/service.yaml → charts/sda-db/templates/service.yaml
diff --git a/sda-db/templates/serviceaccount.yaml → charts/sda-db/templates/serviceaccount.yaml b/sda-db/templates/serviceaccount.yaml → charts/sda-db/templates/serviceaccount.yaml
diff --git a/sda-db/templates/statefulset.yaml → charts/sda-db/templates/statefulset.yaml b/sda-db/templates/statefulset.yaml → charts/sda-db/templates/statefulset.yaml
diff --git a/sda-db/values.yaml → charts/sda-db/values.yaml b/sda-db/values.yaml → charts/sda-db/values.yaml
diff --git a/sda-mq/Chart.yaml → charts/sda-mq/Chart.yaml b/sda-mq/Chart.yaml → charts/sda-mq/Chart.yaml
diff --git a/sda-mq/README.md → charts/sda-mq/README.md b/sda-mq/README.md → charts/sda-mq/README.md
diff --git a/sda-mq/files/README.md → charts/sda-mq/files/README.md b/sda-mq/files/README.md → charts/sda-mq/files/README.md
diff --git a/sda-mq/templates/_helpers.tpl → charts/sda-mq/templates/_helpers.tpl b/sda-mq/templates/_helpers.tpl → charts/sda-mq/templates/_helpers.tpl
diff --git a/sda-mq/templates/networkpolicies.yaml → charts/sda-mq/templates/networkpolicies.yaml b/sda-mq/templates/networkpolicies.yaml → charts/sda-mq/templates/networkpolicies.yaml
diff --git a/sda-mq/templates/podsecuritypolicy.yaml → ...s/sda-mq/templates/podsecuritypolicy.yaml b/sda-mq/templates/podsecuritypolicy.yaml → ...s/sda-mq/templates/podsecuritypolicy.yaml
diff --git a/sda-mq/templates/release-test-deploy.yaml → ...sda-mq/templates/release-test-deploy.yaml b/sda-mq/templates/release-test-deploy.yaml → ...sda-mq/templates/release-test-deploy.yaml
diff --git a/sda-mq/templates/release-test-secrets.yaml → ...da-mq/templates/release-test-secrets.yaml b/sda-mq/templates/release-test-secrets.yaml → ...da-mq/templates/release-test-secrets.yaml
diff --git a/sda-mq/templates/secrets.yaml → charts/sda-mq/templates/secrets.yaml b/sda-mq/templates/secrets.yaml → charts/sda-mq/templates/secrets.yaml
diff --git a/sda-mq/templates/service.yaml → charts/sda-mq/templates/service.yaml b/sda-mq/templates/service.yaml → charts/sda-mq/templates/service.yaml
diff --git a/sda-mq/templates/serviceaccount.yaml → charts/sda-mq/templates/serviceaccount.yaml b/sda-mq/templates/serviceaccount.yaml → charts/sda-mq/templates/serviceaccount.yaml
diff --git a/sda-mq/templates/statefulset.yaml → charts/sda-mq/templates/statefulset.yaml b/sda-mq/templates/statefulset.yaml → charts/sda-mq/templates/statefulset.yaml
diff --git a/sda-mq/values.yaml → charts/sda-mq/values.yaml b/sda-mq/values.yaml → charts/sda-mq/values.yaml
diff --git a/sda-orch/Chart.yaml → charts/sda-orch/Chart.yaml b/sda-orch/Chart.yaml → charts/sda-orch/Chart.yaml
diff --git a/sda-orch/README.md → charts/sda-orch/README.md b/sda-orch/README.md → charts/sda-orch/README.md
diff --git a/sda-orch/files/README.md → charts/sda-orch/files/README.md b/sda-orch/files/README.md → charts/sda-orch/files/README.md
diff --git a/sda-orch/templates/_helpers.yaml → charts/sda-orch/templates/_helpers.yaml b/sda-orch/templates/_helpers.yaml → charts/sda-orch/templates/_helpers.yaml
diff --git a/sda-orch/templates/configmap.yaml → charts/sda-orch/templates/configmap.yaml b/sda-orch/templates/configmap.yaml → charts/sda-orch/templates/configmap.yaml
diff --git a/sda-orch/templates/deployment.yaml → charts/sda-orch/templates/deployment.yaml b/sda-orch/templates/deployment.yaml → charts/sda-orch/templates/deployment.yaml
diff --git a/sda-orch/templates/networkpolicies.yaml → ...s/sda-orch/templates/networkpolicies.yaml b/sda-orch/templates/networkpolicies.yaml → ...s/sda-orch/templates/networkpolicies.yaml
diff --git a/sda-orch/templates/podsecuritypolicy.yaml → ...sda-orch/templates/podsecuritypolicy.yaml b/sda-orch/templates/podsecuritypolicy.yaml → ...sda-orch/templates/podsecuritypolicy.yaml
diff --git a/sda-orch/templates/secrets.yaml → charts/sda-orch/templates/secrets.yaml b/sda-orch/templates/secrets.yaml → charts/sda-orch/templates/secrets.yaml
diff --git a/sda-orch/templates/serviceaccount.yaml → ...ts/sda-orch/templates/serviceaccount.yaml b/sda-orch/templates/serviceaccount.yaml → ...ts/sda-orch/templates/serviceaccount.yaml
diff --git a/sda-orch/values.yaml → charts/sda-orch/values.yaml b/sda-orch/values.yaml → charts/sda-orch/values.yaml
diff --git a/sda-svc/Chart.yaml → charts/sda-svc/Chart.yaml b/sda-svc/Chart.yaml → charts/sda-svc/Chart.yaml
diff --git a/sda-svc/README.md → charts/sda-svc/README.md b/sda-svc/README.md → charts/sda-svc/README.md
diff --git a/sda-svc/files/README.md → charts/sda-svc/files/README.md b/sda-svc/files/README.md → charts/sda-svc/files/README.md
diff --git a/sda-svc/templates/_helpers.yaml → charts/sda-svc/templates/_helpers.yaml b/sda-svc/templates/_helpers.yaml → charts/sda-svc/templates/_helpers.yaml
diff --git a/sda-svc/templates/auth-deploy.yaml → charts/sda-svc/templates/auth-deploy.yaml b/sda-svc/templates/auth-deploy.yaml → charts/sda-svc/templates/auth-deploy.yaml
diff --git a/sda-svc/templates/auth-ingress.yaml → charts/sda-svc/templates/auth-ingress.yaml b/sda-svc/templates/auth-ingress.yaml → charts/sda-svc/templates/auth-ingress.yaml
diff --git a/sda-svc/templates/auth-secrets.yaml → charts/sda-svc/templates/auth-secrets.yaml b/sda-svc/templates/auth-secrets.yaml → charts/sda-svc/templates/auth-secrets.yaml
diff --git a/sda-svc/templates/auth-service.yaml → charts/sda-svc/templates/auth-service.yaml b/sda-svc/templates/auth-service.yaml → charts/sda-svc/templates/auth-service.yaml
diff --git a/sda-svc/templates/backup-deploy.yaml → charts/sda-svc/templates/backup-deploy.yaml b/sda-svc/templates/backup-deploy.yaml → charts/sda-svc/templates/backup-deploy.yaml
diff --git a/sda-svc/templates/backup-secrets.yaml → charts/sda-svc/templates/backup-secrets.yaml b/sda-svc/templates/backup-secrets.yaml → charts/sda-svc/templates/backup-secrets.yaml
diff --git a/sda-svc/templates/doa-deploy.yaml → charts/sda-svc/templates/doa-deploy.yaml b/sda-svc/templates/doa-deploy.yaml → charts/sda-svc/templates/doa-deploy.yaml
diff --git a/sda-svc/templates/doa-ingress.yaml → charts/sda-svc/templates/doa-ingress.yaml b/sda-svc/templates/doa-ingress.yaml → charts/sda-svc/templates/doa-ingress.yaml
diff --git a/sda-svc/templates/doa-secrets.yaml → charts/sda-svc/templates/doa-secrets.yaml b/sda-svc/templates/doa-secrets.yaml → charts/sda-svc/templates/doa-secrets.yaml
diff --git a/sda-svc/templates/doa-service.yaml → charts/sda-svc/templates/doa-service.yaml b/sda-svc/templates/doa-service.yaml → charts/sda-svc/templates/doa-service.yaml
diff --git a/sda-svc/templates/finalize-deploy.yaml → ...ts/sda-svc/templates/finalize-deploy.yaml b/sda-svc/templates/finalize-deploy.yaml → ...ts/sda-svc/templates/finalize-deploy.yaml
diff --git a/sda-svc/templates/finalize-secrets.yaml → ...s/sda-svc/templates/finalize-secrets.yaml b/sda-svc/templates/finalize-secrets.yaml → ...s/sda-svc/templates/finalize-secrets.yaml
diff --git a/sda-svc/templates/inbox-service.yaml → charts/sda-svc/templates/inbox-service.yaml b/sda-svc/templates/inbox-service.yaml → charts/sda-svc/templates/inbox-service.yaml
diff --git a/sda-svc/templates/ingest-deploy.yaml → charts/sda-svc/templates/ingest-deploy.yaml b/sda-svc/templates/ingest-deploy.yaml → charts/sda-svc/templates/ingest-deploy.yaml
diff --git a/sda-svc/templates/ingest-secrets.yaml → charts/sda-svc/templates/ingest-secrets.yaml b/sda-svc/templates/ingest-secrets.yaml → charts/sda-svc/templates/ingest-secrets.yaml
diff --git a/sda-svc/templates/intercept-deploy.yaml → ...s/sda-svc/templates/intercept-deploy.yaml b/sda-svc/templates/intercept-deploy.yaml → ...s/sda-svc/templates/intercept-deploy.yaml
diff --git a/sda-svc/templates/intercept-secrets.yaml → .../sda-svc/templates/intercept-secrets.yaml b/sda-svc/templates/intercept-secrets.yaml → .../sda-svc/templates/intercept-secrets.yaml
diff --git a/sda-svc/templates/mapper-deploy.yaml → charts/sda-svc/templates/mapper-deploy.yaml b/sda-svc/templates/mapper-deploy.yaml → charts/sda-svc/templates/mapper-deploy.yaml
diff --git a/sda-svc/templates/mapper-secrets.yaml → charts/sda-svc/templates/mapper-secrets.yaml b/sda-svc/templates/mapper-secrets.yaml → charts/sda-svc/templates/mapper-secrets.yaml
diff --git a/sda-svc/templates/networkpolicy.yaml → charts/sda-svc/templates/networkpolicy.yaml b/sda-svc/templates/networkpolicy.yaml → charts/sda-svc/templates/networkpolicy.yaml
diff --git a/sda-svc/templates/podsecuritypolicy.yaml → .../sda-svc/templates/podsecuritypolicy.yaml b/sda-svc/templates/podsecuritypolicy.yaml → .../sda-svc/templates/podsecuritypolicy.yaml
diff --git a/sda-svc/templates/release-test-deploy.yml → ...sda-svc/templates/release-test-deploy.yml b/sda-svc/templates/release-test-deploy.yml → ...sda-svc/templates/release-test-deploy.yml
diff --git a/sda-svc/templates/release-test-secrets.yml → ...da-svc/templates/release-test-secrets.yml b/sda-svc/templates/release-test-secrets.yml → ...da-svc/templates/release-test-secrets.yml
diff --git a/sda-svc/templates/s3-inbox-deploy.yaml → ...ts/sda-svc/templates/s3-inbox-deploy.yaml b/sda-svc/templates/s3-inbox-deploy.yaml → ...ts/sda-svc/templates/s3-inbox-deploy.yaml
diff --git a/sda-svc/templates/s3-inbox-ingress.yaml → ...s/sda-svc/templates/s3-inbox-ingress.yaml b/sda-svc/templates/s3-inbox-ingress.yaml → ...s/sda-svc/templates/s3-inbox-ingress.yaml
diff --git a/sda-svc/templates/s3-inbox-secrets.yaml → ...s/sda-svc/templates/s3-inbox-secrets.yaml b/sda-svc/templates/s3-inbox-secrets.yaml → ...s/sda-svc/templates/s3-inbox-secrets.yaml
diff --git a/sda-svc/templates/serviceaccount.yaml → charts/sda-svc/templates/serviceaccount.yaml b/sda-svc/templates/serviceaccount.yaml → charts/sda-svc/templates/serviceaccount.yaml
diff --git a/sda-svc/templates/sftp-inbox-deploy.yaml → .../sda-svc/templates/sftp-inbox-deploy.yaml b/sda-svc/templates/sftp-inbox-deploy.yaml → .../sda-svc/templates/sftp-inbox-deploy.yaml
diff --git a/sda-svc/templates/sftp-inbox-secrets.yaml → ...sda-svc/templates/sftp-inbox-secrets.yaml b/sda-svc/templates/sftp-inbox-secrets.yaml → ...sda-svc/templates/sftp-inbox-secrets.yaml
diff --git a/sda-svc/templates/shared-secrets.yaml → charts/sda-svc/templates/shared-secrets.yaml b/sda-svc/templates/shared-secrets.yaml → charts/sda-svc/templates/shared-secrets.yaml
diff --git a/sda-svc/templates/verify-deploy.yaml → charts/sda-svc/templates/verify-deploy.yaml b/sda-svc/templates/verify-deploy.yaml → charts/sda-svc/templates/verify-deploy.yaml
diff --git a/sda-svc/templates/verify-secrets.yaml → charts/sda-svc/templates/verify-secrets.yaml b/sda-svc/templates/verify-secrets.yaml → charts/sda-svc/templates/verify-secrets.yaml
diff --git a/sda-svc/test/accession.py → charts/sda-svc/test/accession.py b/sda-svc/test/accession.py → charts/sda-svc/test/accession.py
diff --git a/sda-svc/test/release-test.sh → charts/sda-svc/test/release-test.sh b/sda-svc/test/release-test.sh → charts/sda-svc/test/release-test.sh
diff --git a/sda-svc/test/trigger-ingest.py → charts/sda-svc/test/trigger-ingest.py b/sda-svc/test/trigger-ingest.py → charts/sda-svc/test/trigger-ingest.py
diff --git a/sda-svc/test/verify-doa.py → charts/sda-svc/test/verify-doa.py b/sda-svc/test/verify-doa.py → charts/sda-svc/test/verify-doa.py
diff --git a/sda-svc/test/verify-inboxes.py → charts/sda-svc/test/verify-inboxes.py b/sda-svc/test/verify-inboxes.py → charts/sda-svc/test/verify-inboxes.py
diff --git a/sda-svc/values.yaml → charts/sda-svc/values.yaml b/sda-svc/values.yaml → charts/sda-svc/values.yaml
diff --git a/dev_tools/scripts/deploy-db.sh b/dev_tools/scripts/deploy-db.sh
@@ -4,7 +4,7 @@ set -e
 DB_IN_PASS=$(grep pg_in_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 DB_OUT_PASS=$(grep pg_out_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install postgres sda-db \
+helm install postgres charts/sda-db \
 --set securityPolicy.create=false,\
 global.pg_in_password="$DB_IN_PASS",\
 global.pg_out_password="$DB_OUT_PASS",\

diff --git a/dev_tools/scripts/deploy-mq.sh b/dev_tools/scripts/deploy-mq.sh
@@ -3,7 +3,7 @@ set -e
 
 CEGA_MQ_PASS=$(grep cega_mq_pass sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install broker sda-mq \
+helm install broker charts/sda-mq \
 --set securityPolicy.create=false,\
 config.verifyPeer=false,\
 config.adminUser=admin,\

diff --git a/dev_tools/scripts/sda/deploy-orch.sh b/dev_tools/scripts/sda/deploy-orch.sh
@@ -4,6 +4,6 @@ set -e
 DB_IN_PASS=$(grep pg_in_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 DB_OUT_PASS=$(grep pg_out_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install orch sda-orch -f dev_tools/config/orch.yaml \
+helm install orch charts/sda-orch -f dev_tools/config/orch.yaml \
 --set db.passIngest="$DB_IN_PASS",\
 db.passOutgest="$DB_OUT_PASS"
diff --git a/dev_tools/scripts/sda/deploy-posix-federated.sh b/dev_tools/scripts/sda/deploy-posix-federated.sh
@@ -6,7 +6,7 @@ DB_IN_PASS=$(grep pg_in_password sda-deploy-init/config/trace.yml | awk '{print
 DB_OUT_PASS=$(grep pg_out_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 C4GH_PASSPHRASE=$(grep ega_c4gh_passphrase sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install sda sda-svc -f dev_tools/config/posix.yaml \
+helm install sda charts/sda-svc -f dev_tools/config/posix.yaml \
 --set global.broker.vhost=/sda,\
 global.c4gh.passphrase="$C4GH_PASSPHRASE",\
 global.cega.password="$CEGA_USERS_PASS",\

diff --git a/dev_tools/scripts/sda/deploy-posix-standalone.sh b/dev_tools/scripts/sda/deploy-posix-standalone.sh
@@ -6,7 +6,7 @@ DB_IN_PASS=$(grep pg_in_password sda-deploy-init/config/trace.yml | awk '{print
 DB_OUT_PASS=$(grep pg_out_password sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 C4GH_PASSPHRASE=$(grep ega_c4gh_passphrase sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install sda sda-svc -f dev_tools/config/posix.yaml \
+helm install sda charts/sda-svc -f dev_tools/config/posix.yaml \
 --set global.broker.vhost=/sda,\
 global.c4gh.passphrase="$C4GH_PASSPHRASE",\
 global.db.passIngest="$DB_IN_PASS",\

diff --git a/dev_tools/scripts/sda/deploy-s3-federated.sh b/dev_tools/scripts/sda/deploy-s3-federated.sh
@@ -8,7 +8,7 @@ S3_ACCESS_KEY=$(grep s3_archive_access_key sda-deploy-init/config/trace.yml | aw
 S3_SECRET_KEY=$(grep s3_archive_secret_key sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 C4GH_PASSPHRASE=$(grep ega_c4gh_passphrase sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install sda sda-svc -f dev_tools/config/s3.yaml \
+helm install sda charts/sda-svc -f dev_tools/config/s3.yaml \
 --set global.broker.vhost=sda,\
 global.archive.s3AccessKey="$S3_ACCESS_KEY",\
 global.archive.s3SecretKey="$S3_SECRET_KEY",\

diff --git a/dev_tools/scripts/sda/deploy-s3-standalone.sh b/dev_tools/scripts/sda/deploy-s3-standalone.sh
@@ -8,7 +8,7 @@ S3_ACCESS_KEY=$(grep s3_archive_access_key sda-deploy-init/config/trace.yml | aw
 S3_SECRET_KEY=$(grep s3_archive_secret_key sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 C4GH_PASSPHRASE=$(grep ega_c4gh_passphrase sda-deploy-init/config/trace.yml | awk '{print $2}' | sed -e 's/\"//g')
 
-helm install sda sda-svc -f dev_tools/config/s3.yaml \
+helm install sda charts/sda-svc -f dev_tools/config/s3.yaml \
 --set global.archive.s3AccessKey="$S3_ACCESS_KEY",\
 global.archive.s3SecretKey="$S3_SECRET_KEY",\
 global.backupArchive.s3AccessKey="$S3_ACCESS_KEY",\

diff --git a/dev_tools/scripts/svc-setup.sh b/dev_tools/scripts/svc-setup.sh
@@ -6,41 +6,41 @@ cp sda-deploy-init/config/certs/s3.ca.crt public.crt
 cp sda-deploy-init/config/certs/s3.ca.key private.key
 
 ## sda-orch certs
-cp sda-deploy-init/config/certs/root.ca.crt sda-orch/files/ca.crt
-cp sda-deploy-init/config/certs/orchestrate.ca.crt sda-orch/files/orch.crt
-cp sda-deploy-init/config/certs/orchestrate.ca.key sda-orch/files/orch.key
+cp sda-deploy-init/config/certs/root.ca.crt charts/sda-orch/files/ca.crt
+cp sda-deploy-init/config/certs/orchestrate.ca.crt charts/sda-orch/files/orch.crt
+cp sda-deploy-init/config/certs/orchestrate.ca.key charts/sda-orch/files/orch.key
 
 ## sda-db certs
-cp sda-deploy-init/config/certs/root.ca.crt sda-db/files/ca.crt
-cp sda-deploy-init/config/certs/db.ca.crt sda-db/files/pg.crt
-cp sda-deploy-init/config/certs/db.ca.key sda-db/files/pg.key
+cp sda-deploy-init/config/certs/root.ca.crt charts/sda-db/files/ca.crt
+cp sda-deploy-init/config/certs/db.ca.crt charts/sda-db/files/pg.crt
+cp sda-deploy-init/config/certs/db.ca.key charts/sda-db/files/pg.key
 
 ## sda-mq certs
-cp sda-deploy-init/config/certs/root.ca.crt sda-mq/files/ca.crt
-cp sda-deploy-init/config/certs/mq-server.ca.crt sda-mq/files/server.crt
-cp sda-deploy-init/config/certs/mq-server.ca.key sda-mq/files/server.key
+cp sda-deploy-init/config/certs/root.ca.crt charts/sda-mq/files/ca.crt
+cp sda-deploy-init/config/certs/mq-server.ca.crt charts/sda-mq/files/server.crt
+cp sda-deploy-init/config/certs/mq-server.ca.key charts/sda-mq/files/server.key
 
 cp -r sda-deploy-init/config LocalEGA-helm/ega-charts/cega/config
 
 ## sda-svc certs
-cp sda-deploy-init/config/token.pub sda-svc/files/
-cp sda-deploy-init/config/ega_key.c4gh.sec sda-svc/files/c4gh.key
-cp sda-deploy-init/config/ega_key.c4gh.pub sda-svc/files/c4gh.pub
-cp sda-deploy-init/config/certs/*.p12 sda-svc/files/
-cp sda-deploy-init/config/certs/cacerts sda-svc/files/
-cp sda-deploy-init/config/certs/root.ca.crt sda-svc/files/ca.crt
+cp sda-deploy-init/config/token.pub charts/sda-svc/files/
+cp sda-deploy-init/config/ega_key.c4gh.sec charts/sda-svc/files/c4gh.key
+cp sda-deploy-init/config/ega_key.c4gh.pub charts/sda-svc/files/c4gh.pub
+cp sda-deploy-init/config/certs/*.p12 charts/sda-svc/files/
+cp sda-deploy-init/config/certs/cacerts charts/sda-svc/files/
+cp sda-deploy-init/config/certs/root.ca.crt charts/sda-svc/files/ca.crt
 
 for n in backup doa finalize ingest intercept verify mapper inbox
-  do cp sda-deploy-init/config/certs/$n.ca.crt sda-svc/files/"$(echo $n.ca.crt | cut -d '.' -f1,3)"
+  do cp sda-deploy-init/config/certs/$n.ca.crt charts/sda-svc/files/"$(echo $n.ca.crt | cut -d '.' -f1,3)"
 done
 
 for n in backup doa finalize ingest intercept verify mapper inbox
-  do cp sda-deploy-init/config/certs/$n.ca.key sda-svc/files/"$(echo $n.ca.key | cut -d '.' -f1,3)"
+  do cp sda-deploy-init/config/certs/$n.ca.key charts/sda-svc/files/"$(echo $n.ca.key | cut -d '.' -f1,3)"
 done
 
-cp sda-deploy-init/config/certs/res.ca.crt sda-svc/files/auth.crt
-cp sda-deploy-init/config/certs/res.ca.key sda-svc/files/auth.key
+cp sda-deploy-init/config/certs/res.ca.crt charts/sda-svc/files/auth.crt
+cp sda-deploy-init/config/certs/res.ca.key charts/sda-svc/files/auth.key
 
 for p in sda-svc sda-db sda-mq sda-orch
-  do cp sda-deploy-init/config/certs/tester.ca.* "$p/files/"
+  do cp sda-deploy-init/config/certs/tester.ca.* "charts/$p/files/"
 done