diff --git a/.github/linters/ct.yaml b/.github/linters/ct.yaml index cb0d640..0420d84 100644 --- a/.github/linters/ct.yaml +++ b/.github/linters/ct.yaml @@ -2,7 +2,7 @@ remote: origin target-branch: main chart-dirs: - - deployment/kubernetes/charts + - helm-charts helm-extra-args: --timeout 1000s chart-repos: - opensearch=https://opensearch-project.github.io/helm-charts diff --git a/.github/workflows/kubernetes-charts-build.yaml b/.github/workflows/kubernetes-charts-build.yaml index 47b4b67..aee72a1 100644 --- a/.github/workflows/kubernetes-charts-build.yaml +++ b/.github/workflows/kubernetes-charts-build.yaml @@ -6,16 +6,16 @@ on: tags: - "helm-charts-v*.*.*" # e.g., helm-charts-v0.1.1 paths: - - "deployment/kubernetes/charts/**" + - "helm-charts/**" - ".github/workflows/kubernetes-charts-build**" pull_request: paths: - - "deployment/kubernetes/charts/**" + - "helm-charts/**" - ".github/workflows/kubernetes**" defaults: run: - working-directory: ./deployment/kubernetes + working-directory: ./helm-charts jobs: helm-lint-test: @@ -48,18 +48,17 @@ jobs: fi - name: Recursive dependency update (all charts, including nested) - working-directory: . run: | # Run twice so nested subcharts (like cogstack-jupyterhub -> jupyterhub) are fully updated for _ in 1 2; do - # Find every Chart.yaml under deployment/kubernetes/charts and run helm dependency update in its directory + # Find every Chart.yaml under helm-charts and run helm dependency update in its directory while IFS= read -r chartfile; do chart_dir="$(dirname "$chartfile")" if grep -q "^dependencies:" "$chartfile" 2>/dev/null; then echo "Updating dependencies for $chart_dir" helm dependency update "$chart_dir" fi - done < <(find deployment/kubernetes/charts -type f -name Chart.yaml) + done < <(find . -type f -name Chart.yaml) done - name: Run chart-testing (lint) @@ -114,26 +113,24 @@ jobs: - name: Recursive dependency update (all charts, including nested) # Waiting on helm recursive feature https://github.com/helm/helm/pull/30855 # Could alternatively switch to helm "cascade" plugin - working-directory: . run: | # Run twice so nested subcharts (like cogstack-jupyterhub -> jupyterhub) are fully updated for _ in 1 2; do - # Find every Chart.yaml under deployment/kubernetes/charts and run helm dependency update in its directory + # Find every Chart.yaml under helm-charts and run helm dependency update in its directory while IFS= read -r chartfile; do chart_dir="$(dirname "$chartfile")" if grep -q "^dependencies:" "$chartfile" 2>/dev/null; then echo "Updating dependencies for $chart_dir" helm dependency update "$chart_dir" fi - done < <(find deployment/kubernetes/charts -type f -name Chart.yaml) + done < <(find . -type f -name Chart.yaml) done - name: Package Helm Charts - # TODO: List the dir instead of hardcoding each one run: | - helm package ./charts/medcat-service-helm --version ${{ steps.version.outputs.chart_version }} - helm package ./charts/medcat-trainer-helm --version ${{ steps.version.outputs.chart_version }} --dependency-update - helm package ./charts/cogstack-helm-ce --version ${{ steps.version.outputs.chart_version }} --dependency-update + helm package ./medcat-service-helm --version ${{ steps.version.outputs.chart_version }} + helm package ./medcat-trainer-helm --version ${{ steps.version.outputs.chart_version }} --dependency-update + helm package ./cogstack-helm-ce --version ${{ steps.version.outputs.chart_version }} --dependency-update - name: Helm OCI login to Docker Hub run: helm registry login registry-1.docker.io -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }} @@ -150,4 +147,4 @@ jobs: with: draft: true files: | - ./deployment/kubernetes/*.tgz + helm-charts/*.tgz diff --git a/deployment/kubernetes/charts/.gitignore b/helm-charts/.gitignore similarity index 100% rename from deployment/kubernetes/charts/.gitignore rename to helm-charts/.gitignore diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/.helmignore b/helm-charts/cogstack-helm-ce/.helmignore similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/.helmignore rename to helm-charts/cogstack-helm-ce/.helmignore diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/Chart.lock b/helm-charts/cogstack-helm-ce/Chart.lock similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/Chart.lock rename to helm-charts/cogstack-helm-ce/Chart.lock diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/Chart.yaml b/helm-charts/cogstack-helm-ce/Chart.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/Chart.yaml rename to helm-charts/cogstack-helm-ce/Chart.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/README.md b/helm-charts/cogstack-helm-ce/README.md similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/README.md rename to helm-charts/cogstack-helm-ce/README.md diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock b/helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock rename to helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.lock diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml b/helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml rename to helm-charts/cogstack-helm-ce/charts/jupyterhub/Chart.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/values.yaml b/helm-charts/cogstack-helm-ce/charts/jupyterhub/values.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/charts/jupyterhub/values.yaml rename to helm-charts/cogstack-helm-ce/charts/jupyterhub/values.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/ci/ci-values.yaml b/helm-charts/cogstack-helm-ce/ci/ci-values.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/ci/ci-values.yaml rename to helm-charts/cogstack-helm-ce/ci/ci-values.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/provisioning/base_index_settings.json b/helm-charts/cogstack-helm-ce/provisioning/base_index_settings.json similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/provisioning/base_index_settings.json rename to helm-charts/cogstack-helm-ce/provisioning/base_index_settings.json diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/provisioning/dashboards.ndjson b/helm-charts/cogstack-helm-ce/provisioning/dashboards.ndjson similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/provisioning/dashboards.ndjson rename to helm-charts/cogstack-helm-ce/provisioning/dashboards.ndjson diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/provisioning/opensearch-provisioning.sh b/helm-charts/cogstack-helm-ce/provisioning/opensearch-provisioning.sh similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/provisioning/opensearch-provisioning.sh rename to helm-charts/cogstack-helm-ce/provisioning/opensearch-provisioning.sh diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/templates/NOTES.txt b/helm-charts/cogstack-helm-ce/templates/NOTES.txt similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/templates/NOTES.txt rename to helm-charts/cogstack-helm-ce/templates/NOTES.txt diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/templates/_helpers.tpl b/helm-charts/cogstack-helm-ce/templates/_helpers.tpl similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/templates/_helpers.tpl rename to helm-charts/cogstack-helm-ce/templates/_helpers.tpl diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/templates/medcat-trainer-provisioining.yaml b/helm-charts/cogstack-helm-ce/templates/medcat-trainer-provisioining.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/templates/medcat-trainer-provisioining.yaml rename to helm-charts/cogstack-helm-ce/templates/medcat-trainer-provisioining.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/templates/opensearch-provisioning-config-map.yaml b/helm-charts/cogstack-helm-ce/templates/opensearch-provisioning-config-map.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/templates/opensearch-provisioning-config-map.yaml rename to helm-charts/cogstack-helm-ce/templates/opensearch-provisioning-config-map.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/templates/opensearch-provisioning-post-install.yaml b/helm-charts/cogstack-helm-ce/templates/opensearch-provisioning-post-install.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/templates/opensearch-provisioning-post-install.yaml rename to helm-charts/cogstack-helm-ce/templates/opensearch-provisioning-post-install.yaml diff --git a/deployment/kubernetes/charts/cogstack-helm-ce/values.yaml b/helm-charts/cogstack-helm-ce/values.yaml similarity index 100% rename from deployment/kubernetes/charts/cogstack-helm-ce/values.yaml rename to helm-charts/cogstack-helm-ce/values.yaml diff --git a/deployment/kubernetes/local_dev_startup.sh b/helm-charts/local_dev_startup.sh similarity index 100% rename from deployment/kubernetes/local_dev_startup.sh rename to helm-charts/local_dev_startup.sh diff --git a/deployment/kubernetes/charts/medcat-service-helm/.helmignore b/helm-charts/medcat-service-helm/.helmignore similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/.helmignore rename to helm-charts/medcat-service-helm/.helmignore diff --git a/deployment/kubernetes/charts/medcat-service-helm/Chart.yaml b/helm-charts/medcat-service-helm/Chart.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/Chart.yaml rename to helm-charts/medcat-service-helm/Chart.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/README.md b/helm-charts/medcat-service-helm/README.md similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/README.md rename to helm-charts/medcat-service-helm/README.md diff --git a/deployment/kubernetes/charts/medcat-service-helm/ci/default-values.yaml b/helm-charts/medcat-service-helm/ci/default-values.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/ci/default-values.yaml rename to helm-charts/medcat-service-helm/ci/default-values.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/ci/initcontainer-values.yaml b/helm-charts/medcat-service-helm/ci/initcontainer-values.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/ci/initcontainer-values.yaml rename to helm-charts/medcat-service-helm/ci/initcontainer-values.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/NOTES.txt b/helm-charts/medcat-service-helm/templates/NOTES.txt similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/NOTES.txt rename to helm-charts/medcat-service-helm/templates/NOTES.txt diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/_helpers.tpl b/helm-charts/medcat-service-helm/templates/_helpers.tpl similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/_helpers.tpl rename to helm-charts/medcat-service-helm/templates/_helpers.tpl diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/deployment.yaml b/helm-charts/medcat-service-helm/templates/deployment.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/deployment.yaml rename to helm-charts/medcat-service-helm/templates/deployment.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/extraManifests.yaml b/helm-charts/medcat-service-helm/templates/extraManifests.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/extraManifests.yaml rename to helm-charts/medcat-service-helm/templates/extraManifests.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/hpa.yaml b/helm-charts/medcat-service-helm/templates/hpa.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/hpa.yaml rename to helm-charts/medcat-service-helm/templates/hpa.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/ingress.yaml b/helm-charts/medcat-service-helm/templates/ingress.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/ingress.yaml rename to helm-charts/medcat-service-helm/templates/ingress.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/networkpolicy.yaml b/helm-charts/medcat-service-helm/templates/networkpolicy.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/networkpolicy.yaml rename to helm-charts/medcat-service-helm/templates/networkpolicy.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/service.yaml b/helm-charts/medcat-service-helm/templates/service.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/service.yaml rename to helm-charts/medcat-service-helm/templates/service.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/serviceaccount.yaml b/helm-charts/medcat-service-helm/templates/serviceaccount.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/serviceaccount.yaml rename to helm-charts/medcat-service-helm/templates/serviceaccount.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/tests/test-acceptance.yaml b/helm-charts/medcat-service-helm/templates/tests/test-acceptance.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/tests/test-acceptance.yaml rename to helm-charts/medcat-service-helm/templates/tests/test-acceptance.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/templates/tests/test-connection.yaml b/helm-charts/medcat-service-helm/templates/tests/test-connection.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/templates/tests/test-connection.yaml rename to helm-charts/medcat-service-helm/templates/tests/test-connection.yaml diff --git a/deployment/kubernetes/charts/medcat-service-helm/values.yaml b/helm-charts/medcat-service-helm/values.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-service-helm/values.yaml rename to helm-charts/medcat-service-helm/values.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/.helmignore b/helm-charts/medcat-trainer-helm/.helmignore similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/.helmignore rename to helm-charts/medcat-trainer-helm/.helmignore diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/Chart.lock b/helm-charts/medcat-trainer-helm/Chart.lock similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/Chart.lock rename to helm-charts/medcat-trainer-helm/Chart.lock diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/Chart.yaml b/helm-charts/medcat-trainer-helm/Chart.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/Chart.yaml rename to helm-charts/medcat-trainer-helm/Chart.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/README.md b/helm-charts/medcat-trainer-helm/README.md similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/README.md rename to helm-charts/medcat-trainer-helm/README.md diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/NOTES.txt b/helm-charts/medcat-trainer-helm/templates/NOTES.txt similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/NOTES.txt rename to helm-charts/medcat-trainer-helm/templates/NOTES.txt diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/_helpers.tpl b/helm-charts/medcat-trainer-helm/templates/_helpers.tpl similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/_helpers.tpl rename to helm-charts/medcat-trainer-helm/templates/_helpers.tpl diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/hpa.yaml b/helm-charts/medcat-trainer-helm/templates/hpa.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/hpa.yaml rename to helm-charts/medcat-trainer-helm/templates/hpa.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/ingress.yaml b/helm-charts/medcat-trainer-helm/templates/ingress.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/ingress.yaml rename to helm-charts/medcat-trainer-helm/templates/ingress.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-configmap.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-configmap.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-configmap.yaml rename to helm-charts/medcat-trainer-helm/templates/medcat-trainer-configmap.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-deployment.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-deployment.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-deployment.yaml rename to helm-charts/medcat-trainer-helm/templates/medcat-trainer-deployment.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml rename to helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-provisioning-configmap.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-provisioning-configmap.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-provisioning-configmap.yaml rename to helm-charts/medcat-trainer-helm/templates/medcat-trainer-provisioning-configmap.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-secret.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-secret.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/medcat-trainer-secret.yaml rename to helm-charts/medcat-trainer-helm/templates/medcat-trainer-secret.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/nginx-configmap.yaml b/helm-charts/medcat-trainer-helm/templates/nginx-configmap.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/nginx-configmap.yaml rename to helm-charts/medcat-trainer-helm/templates/nginx-configmap.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/pvc.yaml b/helm-charts/medcat-trainer-helm/templates/pvc.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/pvc.yaml rename to helm-charts/medcat-trainer-helm/templates/pvc.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/service.yaml b/helm-charts/medcat-trainer-helm/templates/service.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/service.yaml rename to helm-charts/medcat-trainer-helm/templates/service.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/serviceaccount.yaml b/helm-charts/medcat-trainer-helm/templates/serviceaccount.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/serviceaccount.yaml rename to helm-charts/medcat-trainer-helm/templates/serviceaccount.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/templates/tests/test-connection.yaml b/helm-charts/medcat-trainer-helm/templates/tests/test-connection.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/templates/tests/test-connection.yaml rename to helm-charts/medcat-trainer-helm/templates/tests/test-connection.yaml diff --git a/deployment/kubernetes/charts/medcat-trainer-helm/values.yaml b/helm-charts/medcat-trainer-helm/values.yaml similarity index 100% rename from deployment/kubernetes/charts/medcat-trainer-helm/values.yaml rename to helm-charts/medcat-trainer-helm/values.yaml