diff --git a/.github/workflows/chart-doc.yaml b/.github/workflows/chart-doc.yaml index efd098804..505da2934 100644 --- a/.github/workflows/chart-doc.yaml +++ b/.github/workflows/chart-doc.yaml @@ -16,9 +16,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: install Just uses: extractions/setup-just@v2 @@ -78,9 +76,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com diff --git a/.github/workflows/chart-rebuild.yaml b/.github/workflows/chart-rebuild.yaml index 1d3fba9cb..50954a568 100644 --- a/.github/workflows/chart-rebuild.yaml +++ b/.github/workflows/chart-rebuild.yaml @@ -13,9 +13,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com diff --git a/.github/workflows/chart-releaser.yaml b/.github/workflows/chart-releaser.yaml index 87088efd9..7d5cd0dc9 100644 --- a/.github/workflows/chart-releaser.yaml +++ b/.github/workflows/chart-releaser.yaml @@ -20,9 +20,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Install Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index 2606978f4..81d3c4d7a 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -16,9 +16,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -28,20 +26,12 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.1 - - - name: Symlink ci-lint -> ci - run: | - for dir in ci/*/lint; do - dir=${dir#ci/} - dir=${dir%/lint} - ln -s ../../ci/${dir}/lint charts/${dir}/ci - done + uses: helm/chart-testing-action@v2 - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch main --chart-dirs charts --chart-dirs other-charts) + changed=$(ct list-changed --use-helmignore --target-branch main --chart-dirs charts --chart-dirs other-charts) if [[ -n "$changed" ]]; then echo 'changed=true' >> $GITHUB_OUTPUT fi @@ -49,7 +39,7 @@ jobs: - name: Run chart-testing (lint changed) id: ct-lint if: steps.list-changed.outputs.changed == 'true' - run: ct lint --target-branch main --chart-dirs charts --chart-dirs other-charts + run: ct lint --use-helmignore --target-branch main --chart-dirs charts --chart-dirs other-charts continue-on-error: true - name: Run chart-testing (lint all) @@ -91,20 +81,10 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Install helm unittest plugin - run: helm plugin install --version v0.6.3 https://github.com/helm-unittest/helm-unittest.git - - - name: Symlink ci-tests -> tests - run: | - for dir in ci/*/tests; do - dir=${dir#ci/} - dir=${dir%/tests} - ln -s ../../ci/${dir}/tests charts/${dir}/tests - done + run: helm plugin install https://github.com/helm-unittest/helm-unittest.git - name: Run chart unit tests id: unittest @@ -149,9 +129,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -161,26 +139,18 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.1 - - - name: Symlink ci-install -> ci - run: | - for dir in ci/*/install; do - dir=${dir#ci/} - dir=${dir%/install} - ln -s ../../ci/${dir}/install charts/${dir}/ci - done + uses: helm/chart-testing-action@v2 - name: Run chart-testing (list-changed) id: list-changed run: | - changed=$(ct list-changed --target-branch main --chart-dirs charts --chart-dirs other-charts) + changed=$(ct list-changed --use-helmignore --target-branch main --chart-dirs charts --chart-dirs other-charts) if [[ -n "$changed" ]]; then echo 'changed=true' >> $GITHUB_OUTPUT fi - name: Create kind cluster - uses: helm/kind-action@v1.10.0 + uses: helm/kind-action@v1 - name: Install SealedSecrets Helm Chart run: | @@ -249,9 +219,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.2.0 - with: - version: v3.6.3 + uses: azure/setup-helm@v4 - uses: extractions/setup-just@v2 diff --git a/.gitignore b/.gitignore index ba4ec1783..b32534288 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ _publish.yml /.quarto/ +# helm packages +*.tgz diff --git a/charts/posit-chronicle/.helmignore b/charts/posit-chronicle/.helmignore index f70705f1b..93f437e0a 100644 --- a/charts/posit-chronicle/.helmignore +++ b/charts/posit-chronicle/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.helmignore # Common backup files *.swp *.bak @@ -23,4 +24,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/ci/posit-chronicle/install/empty-values.yaml b/charts/posit-chronicle/ci/empty-values.yaml similarity index 100% rename from ci/posit-chronicle/install/empty-values.yaml rename to charts/posit-chronicle/ci/empty-values.yaml diff --git a/ci/posit-chronicle/lint/complex-values.yaml b/charts/posit-chronicle/lint/complex-values.yaml similarity index 100% rename from ci/posit-chronicle/lint/complex-values.yaml rename to charts/posit-chronicle/lint/complex-values.yaml diff --git a/ci/posit-chronicle/lint/empty-values.yaml b/charts/posit-chronicle/lint/empty-values.yaml similarity index 100% rename from ci/posit-chronicle/lint/empty-values.yaml rename to charts/posit-chronicle/lint/empty-values.yaml diff --git a/ci/posit-chronicle/lint/no-local-storage-values.yaml b/charts/posit-chronicle/lint/no-local-storage-values.yaml similarity index 100% rename from ci/posit-chronicle/lint/no-local-storage-values.yaml rename to charts/posit-chronicle/lint/no-local-storage-values.yaml diff --git a/ci/posit-chronicle/lint/simple-values.yaml b/charts/posit-chronicle/lint/simple-values.yaml similarity index 100% rename from ci/posit-chronicle/lint/simple-values.yaml rename to charts/posit-chronicle/lint/simple-values.yaml diff --git a/charts/rstudio-connect/.helmignore b/charts/rstudio-connect/.helmignore index f70705f1b..93f437e0a 100644 --- a/charts/rstudio-connect/.helmignore +++ b/charts/rstudio-connect/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.helmignore # Common backup files *.swp *.bak @@ -23,4 +24,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/ci/rstudio-connect/install/license-file-values.yaml b/charts/rstudio-connect/ci/license-file-values.yaml similarity index 100% rename from ci/rstudio-connect/install/license-file-values.yaml rename to charts/rstudio-connect/ci/license-file-values.yaml diff --git a/ci/rstudio-connect/lint/complex-values.yaml b/charts/rstudio-connect/lint/complex-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/complex-values.yaml rename to charts/rstudio-connect/lint/complex-values.yaml diff --git a/ci/rstudio-connect/lint/deprecated-values.yaml b/charts/rstudio-connect/lint/deprecated-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/deprecated-values.yaml rename to charts/rstudio-connect/lint/deprecated-values.yaml diff --git a/ci/rstudio-connect/lint/empty-values.yaml b/charts/rstudio-connect/lint/empty-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/empty-values.yaml rename to charts/rstudio-connect/lint/empty-values.yaml diff --git a/ci/rstudio-connect/lint/ingress-values.yaml b/charts/rstudio-connect/lint/ingress-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/ingress-values.yaml rename to charts/rstudio-connect/lint/ingress-values.yaml diff --git a/ci/rstudio-connect/lint/ingress2-values.yaml b/charts/rstudio-connect/lint/ingress2-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/ingress2-values.yaml rename to charts/rstudio-connect/lint/ingress2-values.yaml diff --git a/ci/rstudio-connect/lint/launcher-advanced-values.yaml b/charts/rstudio-connect/lint/launcher-advanced-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/launcher-advanced-values.yaml rename to charts/rstudio-connect/lint/launcher-advanced-values.yaml diff --git a/ci/rstudio-connect/lint/launcher-advanced2-values.yaml b/charts/rstudio-connect/lint/launcher-advanced2-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/launcher-advanced2-values.yaml rename to charts/rstudio-connect/lint/launcher-advanced2-values.yaml diff --git a/ci/rstudio-connect/lint/launcher-advanced3-values.yaml b/charts/rstudio-connect/lint/launcher-advanced3-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/launcher-advanced3-values.yaml rename to charts/rstudio-connect/lint/launcher-advanced3-values.yaml diff --git a/ci/rstudio-connect/lint/launcher-template-values.yaml b/charts/rstudio-connect/lint/launcher-template-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/launcher-template-values.yaml rename to charts/rstudio-connect/lint/launcher-template-values.yaml diff --git a/ci/rstudio-connect/lint/launcher-values.yaml b/charts/rstudio-connect/lint/launcher-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/launcher-values.yaml rename to charts/rstudio-connect/lint/launcher-values.yaml diff --git a/ci/rstudio-connect/lint/simple-values.yaml b/charts/rstudio-connect/lint/simple-values.yaml similarity index 100% rename from ci/rstudio-connect/lint/simple-values.yaml rename to charts/rstudio-connect/lint/simple-values.yaml diff --git a/ci/rstudio-connect/tests/service-accounts_test.yaml b/charts/rstudio-connect/tests/service-accounts_test.yaml similarity index 100% rename from ci/rstudio-connect/tests/service-accounts_test.yaml rename to charts/rstudio-connect/tests/service-accounts_test.yaml diff --git a/charts/rstudio-launcher-rbac/.helmignore b/charts/rstudio-launcher-rbac/.helmignore index f70705f1b..93f437e0a 100644 --- a/charts/rstudio-launcher-rbac/.helmignore +++ b/charts/rstudio-launcher-rbac/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.helmignore # Common backup files *.swp *.bak @@ -23,4 +24,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/ci/rstudio-launcher-rbac/install/empty-values.yaml b/charts/rstudio-launcher-rbac/ci/empty-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/install/empty-values.yaml rename to charts/rstudio-launcher-rbac/ci/empty-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/all-values.yaml b/charts/rstudio-launcher-rbac/lint/all-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/all-values.yaml rename to charts/rstudio-launcher-rbac/lint/all-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/empty-values.yaml b/charts/rstudio-launcher-rbac/lint/empty-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/empty-values.yaml rename to charts/rstudio-launcher-rbac/lint/empty-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/just-yaml-values.yaml b/charts/rstudio-launcher-rbac/lint/just-yaml-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/just-yaml-values.yaml rename to charts/rstudio-launcher-rbac/lint/just-yaml-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/no-release-ns-values.yaml b/charts/rstudio-launcher-rbac/lint/no-release-ns-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/no-release-ns-values.yaml rename to charts/rstudio-launcher-rbac/lint/no-release-ns-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/no-sa-values.yaml b/charts/rstudio-launcher-rbac/lint/no-sa-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/no-sa-values.yaml rename to charts/rstudio-launcher-rbac/lint/no-sa-values.yaml diff --git a/ci/rstudio-launcher-rbac/lint/simple-values.yaml b/charts/rstudio-launcher-rbac/lint/simple-values.yaml similarity index 100% rename from ci/rstudio-launcher-rbac/lint/simple-values.yaml rename to charts/rstudio-launcher-rbac/lint/simple-values.yaml diff --git a/charts/rstudio-library/.helmignore b/charts/rstudio-library/.helmignore index f70705f1b..93f437e0a 100644 --- a/charts/rstudio-library/.helmignore +++ b/charts/rstudio-library/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.helmignore # Common backup files *.swp *.bak @@ -23,4 +24,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-pm/.helmignore b/charts/rstudio-pm/.helmignore index f70705f1b..93f437e0a 100644 --- a/charts/rstudio-pm/.helmignore +++ b/charts/rstudio-pm/.helmignore @@ -10,6 +10,7 @@ .hg/ .hgignore .svn/ +.helmignore # Common backup files *.swp *.bak @@ -23,4 +24,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/ci/rstudio-pm/install/license-file-values.yaml b/charts/rstudio-pm/ci/license-file-values.yaml similarity index 100% rename from ci/rstudio-pm/install/license-file-values.yaml rename to charts/rstudio-pm/ci/license-file-values.yaml diff --git a/ci/rstudio-pm/lint/all-values.yaml b/charts/rstudio-pm/lint/all-values.yaml similarity index 100% rename from ci/rstudio-pm/lint/all-values.yaml rename to charts/rstudio-pm/lint/all-values.yaml diff --git a/ci/rstudio-pm/lint/empty-values.yaml b/charts/rstudio-pm/lint/empty-values.yaml similarity index 100% rename from ci/rstudio-pm/lint/empty-values.yaml rename to charts/rstudio-pm/lint/empty-values.yaml diff --git a/ci/rstudio-pm/lint/ingress-values.yaml b/charts/rstudio-pm/lint/ingress-values.yaml similarity index 100% rename from ci/rstudio-pm/lint/ingress-values.yaml rename to charts/rstudio-pm/lint/ingress-values.yaml diff --git a/ci/rstudio-pm/lint/ingress2-values.yaml b/charts/rstudio-pm/lint/ingress2-values.yaml similarity index 100% rename from ci/rstudio-pm/lint/ingress2-values.yaml rename to charts/rstudio-pm/lint/ingress2-values.yaml diff --git a/ci/rstudio-pm/lint/simple-values.yaml b/charts/rstudio-pm/lint/simple-values.yaml similarity index 100% rename from ci/rstudio-pm/lint/simple-values.yaml rename to charts/rstudio-pm/lint/simple-values.yaml diff --git a/charts/rstudio-workbench/.helmignore b/charts/rstudio-workbench/.helmignore index 1cbd52de3..2e32b2d25 100644 --- a/charts/rstudio-workbench/.helmignore +++ b/charts/rstudio-workbench/.helmignore @@ -1,6 +1,9 @@ snapshot/ Makefile *.gotmpl +.helmignore # chart tests +ci/ +lint/ tests/ diff --git a/ci/rstudio-workbench/install/basic-ingress-values.yaml b/charts/rstudio-workbench/ci/basic-ingress-values.yaml similarity index 100% rename from ci/rstudio-workbench/install/basic-ingress-values.yaml rename to charts/rstudio-workbench/ci/basic-ingress-values.yaml diff --git a/ci/rstudio-workbench/install/basic-service-account-values.yaml b/charts/rstudio-workbench/ci/basic-service-account-values.yaml similarity index 100% rename from ci/rstudio-workbench/install/basic-service-account-values.yaml rename to charts/rstudio-workbench/ci/basic-service-account-values.yaml diff --git a/ci/rstudio-workbench/install/launcher-template-values.yaml b/charts/rstudio-workbench/ci/launcher-template-values.yaml similarity index 100% rename from ci/rstudio-workbench/install/launcher-template-values.yaml rename to charts/rstudio-workbench/ci/launcher-template-values.yaml diff --git a/ci/rstudio-workbench/install/license-file-values.yaml b/charts/rstudio-workbench/ci/license-file-values.yaml similarity index 100% rename from ci/rstudio-workbench/install/license-file-values.yaml rename to charts/rstudio-workbench/ci/license-file-values.yaml diff --git a/ci/rstudio-workbench/install/user-create-values.yaml b/charts/rstudio-workbench/ci/user-create-values.yaml similarity index 100% rename from ci/rstudio-workbench/install/user-create-values.yaml rename to charts/rstudio-workbench/ci/user-create-values.yaml diff --git a/ci/rstudio-workbench/lint/complex-values.yaml b/charts/rstudio-workbench/lint/complex-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/complex-values.yaml rename to charts/rstudio-workbench/lint/complex-values.yaml diff --git a/ci/rstudio-workbench/lint/default-sa-values.yaml b/charts/rstudio-workbench/lint/default-sa-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/default-sa-values.yaml rename to charts/rstudio-workbench/lint/default-sa-values.yaml diff --git a/ci/rstudio-workbench/lint/empty-values.yaml b/charts/rstudio-workbench/lint/empty-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/empty-values.yaml rename to charts/rstudio-workbench/lint/empty-values.yaml diff --git a/ci/rstudio-workbench/lint/ingress-values.yaml b/charts/rstudio-workbench/lint/ingress-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/ingress-values.yaml rename to charts/rstudio-workbench/lint/ingress-values.yaml diff --git a/ci/rstudio-workbench/lint/ingress2-values.yaml b/charts/rstudio-workbench/lint/ingress2-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/ingress2-values.yaml rename to charts/rstudio-workbench/lint/ingress2-values.yaml diff --git a/ci/rstudio-workbench/lint/launcher-template-values.yaml b/charts/rstudio-workbench/lint/launcher-template-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/launcher-template-values.yaml rename to charts/rstudio-workbench/lint/launcher-template-values.yaml diff --git a/ci/rstudio-workbench/lint/license-file-secret-values.yaml b/charts/rstudio-workbench/lint/license-file-secret-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/license-file-secret-values.yaml rename to charts/rstudio-workbench/lint/license-file-secret-values.yaml diff --git a/ci/rstudio-workbench/lint/license-file-values.yaml b/charts/rstudio-workbench/lint/license-file-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/license-file-values.yaml rename to charts/rstudio-workbench/lint/license-file-values.yaml diff --git a/ci/rstudio-workbench/lint/license-server-values.yaml b/charts/rstudio-workbench/lint/license-server-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/license-server-values.yaml rename to charts/rstudio-workbench/lint/license-server-values.yaml diff --git a/ci/rstudio-workbench/lint/license-values.yaml b/charts/rstudio-workbench/lint/license-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/license-values.yaml rename to charts/rstudio-workbench/lint/license-values.yaml diff --git a/ci/rstudio-workbench/lint/other-complex-values.yaml b/charts/rstudio-workbench/lint/other-complex-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/other-complex-values.yaml rename to charts/rstudio-workbench/lint/other-complex-values.yaml diff --git a/ci/rstudio-workbench/lint/overrides-values-new.yaml b/charts/rstudio-workbench/lint/overrides-values-new.yaml similarity index 100% rename from ci/rstudio-workbench/lint/overrides-values-new.yaml rename to charts/rstudio-workbench/lint/overrides-values-new.yaml diff --git a/ci/rstudio-workbench/lint/overrides-values.yaml b/charts/rstudio-workbench/lint/overrides-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/overrides-values.yaml rename to charts/rstudio-workbench/lint/overrides-values.yaml diff --git a/ci/rstudio-workbench/lint/simple-profiles-values.yaml b/charts/rstudio-workbench/lint/simple-profiles-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/simple-profiles-values.yaml rename to charts/rstudio-workbench/lint/simple-profiles-values.yaml diff --git a/ci/rstudio-workbench/lint/simple-values.yaml b/charts/rstudio-workbench/lint/simple-values.yaml similarity index 100% rename from ci/rstudio-workbench/lint/simple-values.yaml rename to charts/rstudio-workbench/lint/simple-values.yaml diff --git a/ci/rstudio-workbench/tests/deployment_test.yaml b/charts/rstudio-workbench/tests/deployment_test.yaml similarity index 100% rename from ci/rstudio-workbench/tests/deployment_test.yaml rename to charts/rstudio-workbench/tests/deployment_test.yaml diff --git a/ci/rstudio-workbench/tests/ingress_test.yaml b/charts/rstudio-workbench/tests/ingress_test.yaml similarity index 100% rename from ci/rstudio-workbench/tests/ingress_test.yaml rename to charts/rstudio-workbench/tests/ingress_test.yaml diff --git a/ci/rstudio-workbench/tests/prometheus_test.yaml b/charts/rstudio-workbench/tests/prometheus_test.yaml similarity index 100% rename from ci/rstudio-workbench/tests/prometheus_test.yaml rename to charts/rstudio-workbench/tests/prometheus_test.yaml diff --git a/ci/rstudio-workbench/tests/service_accounts_test.yaml b/charts/rstudio-workbench/tests/service_accounts_test.yaml similarity index 100% rename from ci/rstudio-workbench/tests/service_accounts_test.yaml rename to charts/rstudio-workbench/tests/service_accounts_test.yaml