From 107a3b77d72c2a028fb4300cffc05eca0895e37f Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 27 Jul 2021 12:21:28 +0200 Subject: [PATCH 1/3] Move charts to a dedicated charts folder This should fix all the issues with the chart publisher not working correctly. --- {sda-db => charts/sda-db}/Chart.yaml | 0 {sda-db => charts/sda-db}/README.md | 0 {sda-db => charts/sda-db}/files/README.md | 0 {sda-db => charts/sda-db}/templates/_helpers.tpl | 0 {sda-db => charts/sda-db}/templates/networkpolicies.yaml | 0 {sda-db => charts/sda-db}/templates/podsecuritypolicy.yaml | 0 {sda-db => charts/sda-db}/templates/release-test-deploy.yaml | 0 {sda-db => charts/sda-db}/templates/release-test-secrets.yaml | 0 {sda-db => charts/sda-db}/templates/secrets.yaml | 0 {sda-db => charts/sda-db}/templates/service.yaml | 0 {sda-db => charts/sda-db}/templates/serviceaccount.yaml | 0 {sda-db => charts/sda-db}/templates/statefulset.yaml | 0 {sda-db => charts/sda-db}/values.yaml | 0 {sda-mq => charts/sda-mq}/Chart.yaml | 0 {sda-mq => charts/sda-mq}/README.md | 0 {sda-mq => charts/sda-mq}/files/README.md | 0 {sda-mq => charts/sda-mq}/templates/_helpers.tpl | 0 {sda-mq => charts/sda-mq}/templates/networkpolicies.yaml | 0 {sda-mq => charts/sda-mq}/templates/podsecuritypolicy.yaml | 0 {sda-mq => charts/sda-mq}/templates/release-test-deploy.yaml | 0 {sda-mq => charts/sda-mq}/templates/release-test-secrets.yaml | 0 {sda-mq => charts/sda-mq}/templates/secrets.yaml | 0 {sda-mq => charts/sda-mq}/templates/service.yaml | 0 {sda-mq => charts/sda-mq}/templates/serviceaccount.yaml | 0 {sda-mq => charts/sda-mq}/templates/statefulset.yaml | 0 {sda-mq => charts/sda-mq}/values.yaml | 0 {sda-orch => charts/sda-orch}/Chart.yaml | 0 {sda-orch => charts/sda-orch}/README.md | 0 {sda-orch => charts/sda-orch}/files/README.md | 0 {sda-orch => charts/sda-orch}/templates/_helpers.yaml | 0 {sda-orch => charts/sda-orch}/templates/configmap.yaml | 0 {sda-orch => charts/sda-orch}/templates/deployment.yaml | 0 {sda-orch => charts/sda-orch}/templates/networkpolicies.yaml | 0 {sda-orch => charts/sda-orch}/templates/podsecuritypolicy.yaml | 0 {sda-orch => charts/sda-orch}/templates/secrets.yaml | 0 {sda-orch => charts/sda-orch}/templates/serviceaccount.yaml | 0 {sda-orch => charts/sda-orch}/values.yaml | 0 {sda-svc => charts/sda-svc}/Chart.yaml | 0 {sda-svc => charts/sda-svc}/README.md | 0 {sda-svc => charts/sda-svc}/files/README.md | 0 {sda-svc => charts/sda-svc}/templates/_helpers.yaml | 0 {sda-svc => charts/sda-svc}/templates/auth-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/auth-ingress.yaml | 0 {sda-svc => charts/sda-svc}/templates/auth-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/auth-service.yaml | 0 {sda-svc => charts/sda-svc}/templates/backup-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/backup-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/doa-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/doa-ingress.yaml | 0 {sda-svc => charts/sda-svc}/templates/doa-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/doa-service.yaml | 0 {sda-svc => charts/sda-svc}/templates/finalize-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/finalize-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/inbox-service.yaml | 0 {sda-svc => charts/sda-svc}/templates/ingest-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/ingest-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/intercept-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/intercept-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/mapper-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/mapper-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/networkpolicy.yaml | 0 {sda-svc => charts/sda-svc}/templates/podsecuritypolicy.yaml | 0 {sda-svc => charts/sda-svc}/templates/release-test-deploy.yml | 0 {sda-svc => charts/sda-svc}/templates/release-test-secrets.yml | 0 {sda-svc => charts/sda-svc}/templates/s3-inbox-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/s3-inbox-ingress.yaml | 0 {sda-svc => charts/sda-svc}/templates/s3-inbox-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/serviceaccount.yaml | 0 {sda-svc => charts/sda-svc}/templates/sftp-inbox-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/sftp-inbox-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/shared-secrets.yaml | 0 {sda-svc => charts/sda-svc}/templates/verify-deploy.yaml | 0 {sda-svc => charts/sda-svc}/templates/verify-secrets.yaml | 0 {sda-svc => charts/sda-svc}/test/accession.py | 0 {sda-svc => charts/sda-svc}/test/release-test.sh | 0 {sda-svc => charts/sda-svc}/test/trigger-ingest.py | 0 {sda-svc => charts/sda-svc}/test/verify-doa.py | 0 {sda-svc => charts/sda-svc}/test/verify-inboxes.py | 0 {sda-svc => charts/sda-svc}/values.yaml | 0 79 files changed, 0 insertions(+), 0 deletions(-) rename {sda-db => charts/sda-db}/Chart.yaml (100%) rename {sda-db => charts/sda-db}/README.md (100%) rename {sda-db => charts/sda-db}/files/README.md (100%) rename {sda-db => charts/sda-db}/templates/_helpers.tpl (100%) rename {sda-db => charts/sda-db}/templates/networkpolicies.yaml (100%) rename {sda-db => charts/sda-db}/templates/podsecuritypolicy.yaml (100%) rename {sda-db => charts/sda-db}/templates/release-test-deploy.yaml (100%) rename {sda-db => charts/sda-db}/templates/release-test-secrets.yaml (100%) rename {sda-db => charts/sda-db}/templates/secrets.yaml (100%) rename {sda-db => charts/sda-db}/templates/service.yaml (100%) rename {sda-db => charts/sda-db}/templates/serviceaccount.yaml (100%) rename {sda-db => charts/sda-db}/templates/statefulset.yaml (100%) rename {sda-db => charts/sda-db}/values.yaml (100%) rename {sda-mq => charts/sda-mq}/Chart.yaml (100%) rename {sda-mq => charts/sda-mq}/README.md (100%) rename {sda-mq => charts/sda-mq}/files/README.md (100%) rename {sda-mq => charts/sda-mq}/templates/_helpers.tpl (100%) rename {sda-mq => charts/sda-mq}/templates/networkpolicies.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/podsecuritypolicy.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/release-test-deploy.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/release-test-secrets.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/secrets.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/service.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/serviceaccount.yaml (100%) rename {sda-mq => charts/sda-mq}/templates/statefulset.yaml (100%) rename {sda-mq => charts/sda-mq}/values.yaml (100%) rename {sda-orch => charts/sda-orch}/Chart.yaml (100%) rename {sda-orch => charts/sda-orch}/README.md (100%) rename {sda-orch => charts/sda-orch}/files/README.md (100%) rename {sda-orch => charts/sda-orch}/templates/_helpers.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/configmap.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/deployment.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/networkpolicies.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/podsecuritypolicy.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/secrets.yaml (100%) rename {sda-orch => charts/sda-orch}/templates/serviceaccount.yaml (100%) rename {sda-orch => charts/sda-orch}/values.yaml (100%) rename {sda-svc => charts/sda-svc}/Chart.yaml (100%) rename {sda-svc => charts/sda-svc}/README.md (100%) rename {sda-svc => charts/sda-svc}/files/README.md (100%) rename {sda-svc => charts/sda-svc}/templates/_helpers.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/auth-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/auth-ingress.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/auth-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/auth-service.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/backup-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/backup-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/doa-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/doa-ingress.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/doa-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/doa-service.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/finalize-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/finalize-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/inbox-service.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/ingest-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/ingest-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/intercept-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/intercept-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/mapper-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/mapper-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/networkpolicy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/podsecuritypolicy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/release-test-deploy.yml (100%) rename {sda-svc => charts/sda-svc}/templates/release-test-secrets.yml (100%) rename {sda-svc => charts/sda-svc}/templates/s3-inbox-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/s3-inbox-ingress.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/s3-inbox-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/serviceaccount.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/sftp-inbox-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/sftp-inbox-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/shared-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/verify-deploy.yaml (100%) rename {sda-svc => charts/sda-svc}/templates/verify-secrets.yaml (100%) rename {sda-svc => charts/sda-svc}/test/accession.py (100%) rename {sda-svc => charts/sda-svc}/test/release-test.sh (100%) rename {sda-svc => charts/sda-svc}/test/trigger-ingest.py (100%) rename {sda-svc => charts/sda-svc}/test/verify-doa.py (100%) rename {sda-svc => charts/sda-svc}/test/verify-inboxes.py (100%) rename {sda-svc => charts/sda-svc}/values.yaml (100%) diff --git a/sda-db/Chart.yaml b/charts/sda-db/Chart.yaml similarity index 100% rename from sda-db/Chart.yaml rename to charts/sda-db/Chart.yaml diff --git a/sda-db/README.md b/charts/sda-db/README.md similarity index 100% rename from sda-db/README.md rename to charts/sda-db/README.md diff --git a/sda-db/files/README.md b/charts/sda-db/files/README.md similarity index 100% rename from sda-db/files/README.md rename to charts/sda-db/files/README.md diff --git a/sda-db/templates/_helpers.tpl b/charts/sda-db/templates/_helpers.tpl similarity index 100% rename from sda-db/templates/_helpers.tpl rename to charts/sda-db/templates/_helpers.tpl diff --git a/sda-db/templates/networkpolicies.yaml b/charts/sda-db/templates/networkpolicies.yaml similarity index 100% rename from sda-db/templates/networkpolicies.yaml rename to charts/sda-db/templates/networkpolicies.yaml diff --git a/sda-db/templates/podsecuritypolicy.yaml b/charts/sda-db/templates/podsecuritypolicy.yaml similarity index 100% rename from sda-db/templates/podsecuritypolicy.yaml rename to charts/sda-db/templates/podsecuritypolicy.yaml diff --git a/sda-db/templates/release-test-deploy.yaml b/charts/sda-db/templates/release-test-deploy.yaml similarity index 100% rename from sda-db/templates/release-test-deploy.yaml rename to charts/sda-db/templates/release-test-deploy.yaml diff --git a/sda-db/templates/release-test-secrets.yaml b/charts/sda-db/templates/release-test-secrets.yaml similarity index 100% rename from sda-db/templates/release-test-secrets.yaml rename to charts/sda-db/templates/release-test-secrets.yaml diff --git a/sda-db/templates/secrets.yaml b/charts/sda-db/templates/secrets.yaml similarity index 100% rename from sda-db/templates/secrets.yaml rename to charts/sda-db/templates/secrets.yaml diff --git a/sda-db/templates/service.yaml b/charts/sda-db/templates/service.yaml similarity index 100% rename from sda-db/templates/service.yaml rename to charts/sda-db/templates/service.yaml diff --git a/sda-db/templates/serviceaccount.yaml b/charts/sda-db/templates/serviceaccount.yaml similarity index 100% rename from sda-db/templates/serviceaccount.yaml rename to charts/sda-db/templates/serviceaccount.yaml diff --git a/sda-db/templates/statefulset.yaml b/charts/sda-db/templates/statefulset.yaml similarity index 100% rename from sda-db/templates/statefulset.yaml rename to charts/sda-db/templates/statefulset.yaml diff --git a/sda-db/values.yaml b/charts/sda-db/values.yaml similarity index 100% rename from sda-db/values.yaml rename to charts/sda-db/values.yaml diff --git a/sda-mq/Chart.yaml b/charts/sda-mq/Chart.yaml similarity index 100% rename from sda-mq/Chart.yaml rename to charts/sda-mq/Chart.yaml diff --git a/sda-mq/README.md b/charts/sda-mq/README.md similarity index 100% rename from sda-mq/README.md rename to charts/sda-mq/README.md diff --git a/sda-mq/files/README.md b/charts/sda-mq/files/README.md similarity index 100% rename from sda-mq/files/README.md rename to charts/sda-mq/files/README.md diff --git a/sda-mq/templates/_helpers.tpl b/charts/sda-mq/templates/_helpers.tpl similarity index 100% rename from sda-mq/templates/_helpers.tpl rename to charts/sda-mq/templates/_helpers.tpl diff --git a/sda-mq/templates/networkpolicies.yaml b/charts/sda-mq/templates/networkpolicies.yaml similarity index 100% rename from sda-mq/templates/networkpolicies.yaml rename to charts/sda-mq/templates/networkpolicies.yaml diff --git a/sda-mq/templates/podsecuritypolicy.yaml b/charts/sda-mq/templates/podsecuritypolicy.yaml similarity index 100% rename from sda-mq/templates/podsecuritypolicy.yaml rename to charts/sda-mq/templates/podsecuritypolicy.yaml diff --git a/sda-mq/templates/release-test-deploy.yaml b/charts/sda-mq/templates/release-test-deploy.yaml similarity index 100% rename from sda-mq/templates/release-test-deploy.yaml rename to charts/sda-mq/templates/release-test-deploy.yaml diff --git a/sda-mq/templates/release-test-secrets.yaml b/charts/sda-mq/templates/release-test-secrets.yaml similarity index 100% rename from sda-mq/templates/release-test-secrets.yaml rename to charts/sda-mq/templates/release-test-secrets.yaml diff --git a/sda-mq/templates/secrets.yaml b/charts/sda-mq/templates/secrets.yaml similarity index 100% rename from sda-mq/templates/secrets.yaml rename to charts/sda-mq/templates/secrets.yaml diff --git a/sda-mq/templates/service.yaml b/charts/sda-mq/templates/service.yaml similarity index 100% rename from sda-mq/templates/service.yaml rename to charts/sda-mq/templates/service.yaml diff --git a/sda-mq/templates/serviceaccount.yaml b/charts/sda-mq/templates/serviceaccount.yaml similarity index 100% rename from sda-mq/templates/serviceaccount.yaml rename to charts/sda-mq/templates/serviceaccount.yaml diff --git a/sda-mq/templates/statefulset.yaml b/charts/sda-mq/templates/statefulset.yaml similarity index 100% rename from sda-mq/templates/statefulset.yaml rename to charts/sda-mq/templates/statefulset.yaml diff --git a/sda-mq/values.yaml b/charts/sda-mq/values.yaml similarity index 100% rename from sda-mq/values.yaml rename to charts/sda-mq/values.yaml diff --git a/sda-orch/Chart.yaml b/charts/sda-orch/Chart.yaml similarity index 100% rename from sda-orch/Chart.yaml rename to charts/sda-orch/Chart.yaml diff --git a/sda-orch/README.md b/charts/sda-orch/README.md similarity index 100% rename from sda-orch/README.md rename to charts/sda-orch/README.md diff --git a/sda-orch/files/README.md b/charts/sda-orch/files/README.md similarity index 100% rename from sda-orch/files/README.md rename to charts/sda-orch/files/README.md diff --git a/sda-orch/templates/_helpers.yaml b/charts/sda-orch/templates/_helpers.yaml similarity index 100% rename from sda-orch/templates/_helpers.yaml rename to charts/sda-orch/templates/_helpers.yaml diff --git a/sda-orch/templates/configmap.yaml b/charts/sda-orch/templates/configmap.yaml similarity index 100% rename from sda-orch/templates/configmap.yaml rename to charts/sda-orch/templates/configmap.yaml diff --git a/sda-orch/templates/deployment.yaml b/charts/sda-orch/templates/deployment.yaml similarity index 100% rename from sda-orch/templates/deployment.yaml rename to charts/sda-orch/templates/deployment.yaml diff --git a/sda-orch/templates/networkpolicies.yaml b/charts/sda-orch/templates/networkpolicies.yaml similarity index 100% rename from sda-orch/templates/networkpolicies.yaml rename to charts/sda-orch/templates/networkpolicies.yaml diff --git a/sda-orch/templates/podsecuritypolicy.yaml b/charts/sda-orch/templates/podsecuritypolicy.yaml similarity index 100% rename from sda-orch/templates/podsecuritypolicy.yaml rename to charts/sda-orch/templates/podsecuritypolicy.yaml diff --git a/sda-orch/templates/secrets.yaml b/charts/sda-orch/templates/secrets.yaml similarity index 100% rename from sda-orch/templates/secrets.yaml rename to charts/sda-orch/templates/secrets.yaml diff --git a/sda-orch/templates/serviceaccount.yaml b/charts/sda-orch/templates/serviceaccount.yaml similarity index 100% rename from sda-orch/templates/serviceaccount.yaml rename to charts/sda-orch/templates/serviceaccount.yaml diff --git a/sda-orch/values.yaml b/charts/sda-orch/values.yaml similarity index 100% rename from sda-orch/values.yaml rename to charts/sda-orch/values.yaml diff --git a/sda-svc/Chart.yaml b/charts/sda-svc/Chart.yaml similarity index 100% rename from sda-svc/Chart.yaml rename to charts/sda-svc/Chart.yaml diff --git a/sda-svc/README.md b/charts/sda-svc/README.md similarity index 100% rename from sda-svc/README.md rename to charts/sda-svc/README.md diff --git a/sda-svc/files/README.md b/charts/sda-svc/files/README.md similarity index 100% rename from sda-svc/files/README.md rename to charts/sda-svc/files/README.md diff --git a/sda-svc/templates/_helpers.yaml b/charts/sda-svc/templates/_helpers.yaml similarity index 100% rename from sda-svc/templates/_helpers.yaml rename to charts/sda-svc/templates/_helpers.yaml diff --git a/sda-svc/templates/auth-deploy.yaml b/charts/sda-svc/templates/auth-deploy.yaml similarity index 100% rename from sda-svc/templates/auth-deploy.yaml rename to charts/sda-svc/templates/auth-deploy.yaml diff --git a/sda-svc/templates/auth-ingress.yaml b/charts/sda-svc/templates/auth-ingress.yaml similarity index 100% rename from sda-svc/templates/auth-ingress.yaml rename to charts/sda-svc/templates/auth-ingress.yaml diff --git a/sda-svc/templates/auth-secrets.yaml b/charts/sda-svc/templates/auth-secrets.yaml similarity index 100% rename from sda-svc/templates/auth-secrets.yaml rename to charts/sda-svc/templates/auth-secrets.yaml diff --git a/sda-svc/templates/auth-service.yaml b/charts/sda-svc/templates/auth-service.yaml similarity index 100% rename from sda-svc/templates/auth-service.yaml rename to charts/sda-svc/templates/auth-service.yaml diff --git a/sda-svc/templates/backup-deploy.yaml b/charts/sda-svc/templates/backup-deploy.yaml similarity index 100% rename from sda-svc/templates/backup-deploy.yaml rename to charts/sda-svc/templates/backup-deploy.yaml diff --git a/sda-svc/templates/backup-secrets.yaml b/charts/sda-svc/templates/backup-secrets.yaml similarity index 100% rename from sda-svc/templates/backup-secrets.yaml rename to charts/sda-svc/templates/backup-secrets.yaml diff --git a/sda-svc/templates/doa-deploy.yaml b/charts/sda-svc/templates/doa-deploy.yaml similarity index 100% rename from sda-svc/templates/doa-deploy.yaml rename to charts/sda-svc/templates/doa-deploy.yaml diff --git a/sda-svc/templates/doa-ingress.yaml b/charts/sda-svc/templates/doa-ingress.yaml similarity index 100% rename from sda-svc/templates/doa-ingress.yaml rename to charts/sda-svc/templates/doa-ingress.yaml diff --git a/sda-svc/templates/doa-secrets.yaml b/charts/sda-svc/templates/doa-secrets.yaml similarity index 100% rename from sda-svc/templates/doa-secrets.yaml rename to charts/sda-svc/templates/doa-secrets.yaml diff --git a/sda-svc/templates/doa-service.yaml b/charts/sda-svc/templates/doa-service.yaml similarity index 100% rename from sda-svc/templates/doa-service.yaml rename to charts/sda-svc/templates/doa-service.yaml diff --git a/sda-svc/templates/finalize-deploy.yaml b/charts/sda-svc/templates/finalize-deploy.yaml similarity index 100% rename from sda-svc/templates/finalize-deploy.yaml rename to charts/sda-svc/templates/finalize-deploy.yaml diff --git a/sda-svc/templates/finalize-secrets.yaml b/charts/sda-svc/templates/finalize-secrets.yaml similarity index 100% rename from sda-svc/templates/finalize-secrets.yaml rename to charts/sda-svc/templates/finalize-secrets.yaml diff --git a/sda-svc/templates/inbox-service.yaml b/charts/sda-svc/templates/inbox-service.yaml similarity index 100% rename from sda-svc/templates/inbox-service.yaml rename to charts/sda-svc/templates/inbox-service.yaml diff --git a/sda-svc/templates/ingest-deploy.yaml b/charts/sda-svc/templates/ingest-deploy.yaml similarity index 100% rename from sda-svc/templates/ingest-deploy.yaml rename to charts/sda-svc/templates/ingest-deploy.yaml diff --git a/sda-svc/templates/ingest-secrets.yaml b/charts/sda-svc/templates/ingest-secrets.yaml similarity index 100% rename from sda-svc/templates/ingest-secrets.yaml rename to charts/sda-svc/templates/ingest-secrets.yaml diff --git a/sda-svc/templates/intercept-deploy.yaml b/charts/sda-svc/templates/intercept-deploy.yaml similarity index 100% rename from sda-svc/templates/intercept-deploy.yaml rename to charts/sda-svc/templates/intercept-deploy.yaml diff --git a/sda-svc/templates/intercept-secrets.yaml b/charts/sda-svc/templates/intercept-secrets.yaml similarity index 100% rename from sda-svc/templates/intercept-secrets.yaml rename to charts/sda-svc/templates/intercept-secrets.yaml diff --git a/sda-svc/templates/mapper-deploy.yaml b/charts/sda-svc/templates/mapper-deploy.yaml similarity index 100% rename from sda-svc/templates/mapper-deploy.yaml rename to charts/sda-svc/templates/mapper-deploy.yaml diff --git a/sda-svc/templates/mapper-secrets.yaml b/charts/sda-svc/templates/mapper-secrets.yaml similarity index 100% rename from sda-svc/templates/mapper-secrets.yaml rename to charts/sda-svc/templates/mapper-secrets.yaml diff --git a/sda-svc/templates/networkpolicy.yaml b/charts/sda-svc/templates/networkpolicy.yaml similarity index 100% rename from sda-svc/templates/networkpolicy.yaml rename to charts/sda-svc/templates/networkpolicy.yaml diff --git a/sda-svc/templates/podsecuritypolicy.yaml b/charts/sda-svc/templates/podsecuritypolicy.yaml similarity index 100% rename from sda-svc/templates/podsecuritypolicy.yaml rename to charts/sda-svc/templates/podsecuritypolicy.yaml diff --git a/sda-svc/templates/release-test-deploy.yml b/charts/sda-svc/templates/release-test-deploy.yml similarity index 100% rename from sda-svc/templates/release-test-deploy.yml rename to charts/sda-svc/templates/release-test-deploy.yml diff --git a/sda-svc/templates/release-test-secrets.yml b/charts/sda-svc/templates/release-test-secrets.yml similarity index 100% rename from sda-svc/templates/release-test-secrets.yml rename to charts/sda-svc/templates/release-test-secrets.yml diff --git a/sda-svc/templates/s3-inbox-deploy.yaml b/charts/sda-svc/templates/s3-inbox-deploy.yaml similarity index 100% rename from sda-svc/templates/s3-inbox-deploy.yaml rename to charts/sda-svc/templates/s3-inbox-deploy.yaml diff --git a/sda-svc/templates/s3-inbox-ingress.yaml b/charts/sda-svc/templates/s3-inbox-ingress.yaml similarity index 100% rename from sda-svc/templates/s3-inbox-ingress.yaml rename to charts/sda-svc/templates/s3-inbox-ingress.yaml diff --git a/sda-svc/templates/s3-inbox-secrets.yaml b/charts/sda-svc/templates/s3-inbox-secrets.yaml similarity index 100% rename from sda-svc/templates/s3-inbox-secrets.yaml rename to charts/sda-svc/templates/s3-inbox-secrets.yaml diff --git a/sda-svc/templates/serviceaccount.yaml b/charts/sda-svc/templates/serviceaccount.yaml similarity index 100% rename from sda-svc/templates/serviceaccount.yaml rename to charts/sda-svc/templates/serviceaccount.yaml diff --git a/sda-svc/templates/sftp-inbox-deploy.yaml b/charts/sda-svc/templates/sftp-inbox-deploy.yaml similarity index 100% rename from sda-svc/templates/sftp-inbox-deploy.yaml rename to charts/sda-svc/templates/sftp-inbox-deploy.yaml diff --git a/sda-svc/templates/sftp-inbox-secrets.yaml b/charts/sda-svc/templates/sftp-inbox-secrets.yaml similarity index 100% rename from sda-svc/templates/sftp-inbox-secrets.yaml rename to charts/sda-svc/templates/sftp-inbox-secrets.yaml diff --git a/sda-svc/templates/shared-secrets.yaml b/charts/sda-svc/templates/shared-secrets.yaml similarity index 100% rename from sda-svc/templates/shared-secrets.yaml rename to charts/sda-svc/templates/shared-secrets.yaml diff --git a/sda-svc/templates/verify-deploy.yaml b/charts/sda-svc/templates/verify-deploy.yaml similarity index 100% rename from sda-svc/templates/verify-deploy.yaml rename to charts/sda-svc/templates/verify-deploy.yaml diff --git a/sda-svc/templates/verify-secrets.yaml b/charts/sda-svc/templates/verify-secrets.yaml similarity index 100% rename from sda-svc/templates/verify-secrets.yaml rename to charts/sda-svc/templates/verify-secrets.yaml diff --git a/sda-svc/test/accession.py b/charts/sda-svc/test/accession.py similarity index 100% rename from sda-svc/test/accession.py rename to charts/sda-svc/test/accession.py diff --git a/sda-svc/test/release-test.sh b/charts/sda-svc/test/release-test.sh similarity index 100% rename from sda-svc/test/release-test.sh rename to charts/sda-svc/test/release-test.sh diff --git a/sda-svc/test/trigger-ingest.py b/charts/sda-svc/test/trigger-ingest.py similarity index 100% rename from sda-svc/test/trigger-ingest.py rename to charts/sda-svc/test/trigger-ingest.py diff --git a/sda-svc/test/verify-doa.py b/charts/sda-svc/test/verify-doa.py similarity index 100% rename from sda-svc/test/verify-doa.py rename to charts/sda-svc/test/verify-doa.py diff --git a/sda-svc/test/verify-inboxes.py b/charts/sda-svc/test/verify-inboxes.py similarity index 100% rename from sda-svc/test/verify-inboxes.py rename to charts/sda-svc/test/verify-inboxes.py diff --git a/sda-svc/values.yaml b/charts/sda-svc/values.yaml similarity index 100% rename from sda-svc/values.yaml rename to charts/sda-svc/values.yaml From f6cffd2258dec77a35d1703e540aa95d1f24ba51 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 27 Jul 2021 12:48:23 +0200 Subject: [PATCH 2/3] Update scripts with new chart paths --- dev_tools/scripts/deploy-db.sh | 2 +- dev_tools/scripts/deploy-mq.sh | 2 +- dev_tools/scripts/sda/deploy-orch.sh | 2 +- .../scripts/sda/deploy-posix-federated.sh | 2 +- .../scripts/sda/deploy-posix-standalone.sh | 2 +- dev_tools/scripts/sda/deploy-s3-federated.sh | 2 +- dev_tools/scripts/sda/deploy-s3-standalone.sh | 2 +- dev_tools/scripts/svc-setup.sh | 40 +++++++++---------- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dev_tools/scripts/deploy-db.sh b/dev_tools/scripts/deploy-db.sh index cf9cddcd..bd3adbc0 100755 --- 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 index d8bb6118..1ab9e859 100755 --- 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 index 07dd63cf..9228a922 100755 --- 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 index 61e84579..a00529fa 100755 --- 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 index 2d7713b5..b5c6a349 100755 --- 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 index 258edb3f..d4ddb4f2 100755 --- 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 index b875de2d..82834f27 100755 --- 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 index e4fd8af9..0b0d0c56 100755 --- 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 From 70923a9dd13e20782b4cb640f732667a375e8367 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 27 Jul 2021 12:48:33 +0200 Subject: [PATCH 3/3] Update workflows with new chart paths --- .github/ci_tests/lint_helper.sh | 2 ++ .github/workflows/lint.yml | 8 ++++---- .github/workflows/manual_release.yaml | 2 -- .github/workflows/publish_charts.yml | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/ci_tests/lint_helper.sh b/.github/ci_tests/lint_helper.sh index ac6d4c81..002f40b3 100644 --- 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 index a21e3b91..9b670006 100644 --- 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 index d4cde4db..cf275349 100644 --- 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 index 0e8c11ee..c81f3f05 100644 --- 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 }}"