From f2ab91b68caf2069680a95cb0dcce5d2cf899d06 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 13:50:13 -0500 Subject: [PATCH 1/6] Update .helmignore to skip test directories. Also ignore packaged charts in .gitignore --- .gitignore | 2 ++ charts/posit-chronicle/.helmignore | 2 ++ charts/rstudio-connect/.helmignore | 2 ++ charts/rstudio-launcher-rbac/.helmignore | 2 ++ charts/rstudio-library/.helmignore | 2 ++ charts/rstudio-pm/.helmignore | 2 ++ charts/rstudio-workbench/.helmignore | 2 ++ 7 files changed, 14 insertions(+) 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..6ecba2b9d 100644 --- a/charts/posit-chronicle/.helmignore +++ b/charts/posit-chronicle/.helmignore @@ -23,4 +23,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-connect/.helmignore b/charts/rstudio-connect/.helmignore index f70705f1b..6ecba2b9d 100644 --- a/charts/rstudio-connect/.helmignore +++ b/charts/rstudio-connect/.helmignore @@ -23,4 +23,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-launcher-rbac/.helmignore b/charts/rstudio-launcher-rbac/.helmignore index f70705f1b..6ecba2b9d 100644 --- a/charts/rstudio-launcher-rbac/.helmignore +++ b/charts/rstudio-launcher-rbac/.helmignore @@ -23,4 +23,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-library/.helmignore b/charts/rstudio-library/.helmignore index f70705f1b..6ecba2b9d 100644 --- a/charts/rstudio-library/.helmignore +++ b/charts/rstudio-library/.helmignore @@ -23,4 +23,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-pm/.helmignore b/charts/rstudio-pm/.helmignore index f70705f1b..6ecba2b9d 100644 --- a/charts/rstudio-pm/.helmignore +++ b/charts/rstudio-pm/.helmignore @@ -23,4 +23,6 @@ .vscode/ # chart tests +ci/ +lint/ tests/ diff --git a/charts/rstudio-workbench/.helmignore b/charts/rstudio-workbench/.helmignore index 1cbd52de3..e0299028a 100644 --- a/charts/rstudio-workbench/.helmignore +++ b/charts/rstudio-workbench/.helmignore @@ -3,4 +3,6 @@ Makefile *.gotmpl # chart tests +ci/ +lint/ tests/ From 0b5b3f910ffded3a5c4aa0c54f94a00987d0c150 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 13:58:09 -0500 Subject: [PATCH 2/6] Move test files into chart directories Both chart-testing and unittest now support .helmignore --- .github/workflows/chart-test.yaml | 24 ------------------- .../posit-chronicle/ci}/empty-values.yaml | 0 .../posit-chronicle/lint/complex-values.yaml | 0 .../posit-chronicle/lint/empty-values.yaml | 0 .../lint/no-local-storage-values.yaml | 0 .../posit-chronicle/lint/simple-values.yaml | 0 .../ci}/license-file-values.yaml | 0 .../rstudio-connect/lint/complex-values.yaml | 0 .../lint/deprecated-values.yaml | 0 .../rstudio-connect/lint/empty-values.yaml | 0 .../rstudio-connect/lint/ingress-values.yaml | 0 .../rstudio-connect/lint/ingress2-values.yaml | 0 .../lint/launcher-advanced-values.yaml | 0 .../lint/launcher-advanced2-values.yaml | 0 .../lint/launcher-advanced3-values.yaml | 0 .../lint/launcher-template-values.yaml | 0 .../rstudio-connect/lint/launcher-values.yaml | 0 .../rstudio-connect/lint/simple-values.yaml | 0 .../tests/service-accounts_test.yaml | 0 .../ci}/empty-values.yaml | 0 .../lint/all-values.yaml | 0 .../lint/empty-values.yaml | 0 .../lint/just-yaml-values.yaml | 0 .../lint/no-release-ns-values.yaml | 0 .../lint/no-sa-values.yaml | 0 .../lint/simple-values.yaml | 0 .../rstudio-pm/ci}/license-file-values.yaml | 0 .../rstudio-pm/lint/all-values.yaml | 0 .../rstudio-pm/lint/empty-values.yaml | 0 .../rstudio-pm/lint/ingress-values.yaml | 0 .../rstudio-pm/lint/ingress2-values.yaml | 0 .../rstudio-pm/lint/simple-values.yaml | 0 .../ci}/basic-ingress-values.yaml | 0 .../ci}/basic-service-account-values.yaml | 0 .../ci}/launcher-template-values.yaml | 0 .../ci}/license-file-values.yaml | 0 .../ci}/user-create-values.yaml | 0 .../lint/complex-values.yaml | 0 .../lint/default-sa-values.yaml | 0 .../rstudio-workbench/lint/empty-values.yaml | 0 .../lint/ingress-values.yaml | 0 .../lint/ingress2-values.yaml | 0 .../lint/launcher-template-values.yaml | 0 .../lint/license-file-secret-values.yaml | 0 .../lint/license-file-values.yaml | 0 .../lint/license-server-values.yaml | 0 .../lint/license-values.yaml | 0 .../lint/other-complex-values.yaml | 0 .../lint/overrides-values-new.yaml | 0 .../lint/overrides-values.yaml | 0 .../lint/simple-profiles-values.yaml | 0 .../rstudio-workbench/lint/simple-values.yaml | 0 .../tests/deployment_test.yaml | 0 .../rstudio-workbench/tests/ingress_test.yaml | 0 .../tests/prometheus_test.yaml | 0 .../tests/service_accounts_test.yaml | 0 56 files changed, 24 deletions(-) rename {ci/posit-chronicle/install => charts/posit-chronicle/ci}/empty-values.yaml (100%) rename {ci => charts}/posit-chronicle/lint/complex-values.yaml (100%) rename {ci => charts}/posit-chronicle/lint/empty-values.yaml (100%) rename {ci => charts}/posit-chronicle/lint/no-local-storage-values.yaml (100%) rename {ci => charts}/posit-chronicle/lint/simple-values.yaml (100%) rename {ci/rstudio-connect/install => charts/rstudio-connect/ci}/license-file-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/complex-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/deprecated-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/empty-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/ingress-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/ingress2-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/launcher-advanced-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/launcher-advanced2-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/launcher-advanced3-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/launcher-template-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/launcher-values.yaml (100%) rename {ci => charts}/rstudio-connect/lint/simple-values.yaml (100%) rename {ci => charts}/rstudio-connect/tests/service-accounts_test.yaml (100%) rename {ci/rstudio-launcher-rbac/install => charts/rstudio-launcher-rbac/ci}/empty-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/all-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/empty-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/just-yaml-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/no-release-ns-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/no-sa-values.yaml (100%) rename {ci => charts}/rstudio-launcher-rbac/lint/simple-values.yaml (100%) rename {ci/rstudio-pm/install => charts/rstudio-pm/ci}/license-file-values.yaml (100%) rename {ci => charts}/rstudio-pm/lint/all-values.yaml (100%) rename {ci => charts}/rstudio-pm/lint/empty-values.yaml (100%) rename {ci => charts}/rstudio-pm/lint/ingress-values.yaml (100%) rename {ci => charts}/rstudio-pm/lint/ingress2-values.yaml (100%) rename {ci => charts}/rstudio-pm/lint/simple-values.yaml (100%) rename {ci/rstudio-workbench/install => charts/rstudio-workbench/ci}/basic-ingress-values.yaml (100%) rename {ci/rstudio-workbench/install => charts/rstudio-workbench/ci}/basic-service-account-values.yaml (100%) rename {ci/rstudio-workbench/install => charts/rstudio-workbench/ci}/launcher-template-values.yaml (100%) rename {ci/rstudio-workbench/install => charts/rstudio-workbench/ci}/license-file-values.yaml (100%) rename {ci/rstudio-workbench/install => charts/rstudio-workbench/ci}/user-create-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/complex-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/default-sa-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/empty-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/ingress-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/ingress2-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/launcher-template-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/license-file-secret-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/license-file-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/license-server-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/license-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/other-complex-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/overrides-values-new.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/overrides-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/simple-profiles-values.yaml (100%) rename {ci => charts}/rstudio-workbench/lint/simple-values.yaml (100%) rename {ci => charts}/rstudio-workbench/tests/deployment_test.yaml (100%) rename {ci => charts}/rstudio-workbench/tests/ingress_test.yaml (100%) rename {ci => charts}/rstudio-workbench/tests/prometheus_test.yaml (100%) rename {ci => charts}/rstudio-workbench/tests/service_accounts_test.yaml (100%) diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index 2606978f4..b923fb36b 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -30,14 +30,6 @@ jobs: - 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 - - name: Run chart-testing (list-changed) id: list-changed run: | @@ -98,14 +90,6 @@ jobs: - 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 - - name: Run chart unit tests id: unittest run: | @@ -163,14 +147,6 @@ jobs: - 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 - - name: Run chart-testing (list-changed) id: list-changed run: | 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/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/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/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/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 From 892e972898330a3f169fe2a1cb3dff0f9bda75fb Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 14:06:17 -0500 Subject: [PATCH 3/6] Use helmignore for chart-testing and unittest --- .github/workflows/chart-test.yaml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index b923fb36b..046f098c8 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.3.0 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -28,12 +26,12 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.1 + uses: helm/chart-testing-action@v2.7.0 - 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 @@ -41,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) @@ -83,12 +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.3.0 - name: Install helm unittest plugin - run: helm plugin install --version v0.6.3 https://github.com/helm-unittest/helm-unittest.git + run: helm plugin install https://github.com/helm-unittest/helm-unittest.git - name: Run chart unit tests id: unittest @@ -133,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.3.0 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -145,12 +139,12 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.1 + uses: helm/chart-testing-action@v2.7.0 - 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 @@ -225,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.3.0 - uses: extractions/setup-just@v2 From 481c1d9cef53dadfe083bf709eb772c6eef2a000 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 14:35:26 -0500 Subject: [PATCH 4/6] Add .helmignore to .helmignore so chart-testing ignores changes --- charts/posit-chronicle/.helmignore | 1 + charts/rstudio-connect/.helmignore | 1 + charts/rstudio-launcher-rbac/.helmignore | 1 + charts/rstudio-library/.helmignore | 1 + charts/rstudio-pm/.helmignore | 1 + charts/rstudio-workbench/.helmignore | 1 + 6 files changed, 6 insertions(+) diff --git a/charts/posit-chronicle/.helmignore b/charts/posit-chronicle/.helmignore index 6ecba2b9d..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 diff --git a/charts/rstudio-connect/.helmignore b/charts/rstudio-connect/.helmignore index 6ecba2b9d..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 diff --git a/charts/rstudio-launcher-rbac/.helmignore b/charts/rstudio-launcher-rbac/.helmignore index 6ecba2b9d..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 diff --git a/charts/rstudio-library/.helmignore b/charts/rstudio-library/.helmignore index 6ecba2b9d..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 diff --git a/charts/rstudio-pm/.helmignore b/charts/rstudio-pm/.helmignore index 6ecba2b9d..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 diff --git a/charts/rstudio-workbench/.helmignore b/charts/rstudio-workbench/.helmignore index e0299028a..2e32b2d25 100644 --- a/charts/rstudio-workbench/.helmignore +++ b/charts/rstudio-workbench/.helmignore @@ -1,6 +1,7 @@ snapshot/ Makefile *.gotmpl +.helmignore # chart tests ci/ From e0809abe1cd3e9272f9c54c16356bdfd3e29444a Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 15:14:15 -0500 Subject: [PATCH 5/6] Update helm/kind-action to latest --- .github/workflows/chart-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml index 046f098c8..fd34c892f 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -150,7 +150,7 @@ jobs: fi - name: Create kind cluster - uses: helm/kind-action@v1.10.0 + uses: helm/kind-action@v1 - name: Install SealedSecrets Helm Chart run: | From d828218e4fd3ef5b1dc12c20e1520d1345308112 Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Fri, 23 May 2025 15:18:53 -0500 Subject: [PATCH 6/6] Specify major version for Actions This allows us to automatically be kept up-to-date with the latest version of the action, which in turn gets us the latest version of helm and chart-testing --- .github/workflows/chart-doc.yaml | 8 ++------ .github/workflows/chart-rebuild.yaml | 4 +--- .github/workflows/chart-releaser.yaml | 4 +--- .github/workflows/chart-test.yaml | 12 ++++++------ 4 files changed, 10 insertions(+), 18 deletions(-) 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 fd34c892f..81d3c4d7a 100644 --- a/.github/workflows/chart-test.yaml +++ b/.github/workflows/chart-test.yaml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.3.0 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -26,7 +26,7 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.7.0 + uses: helm/chart-testing-action@v2 - name: Run chart-testing (list-changed) id: list-changed @@ -81,7 +81,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.3.0 + uses: azure/setup-helm@v4 - name: Install helm unittest plugin run: helm plugin install https://github.com/helm-unittest/helm-unittest.git @@ -129,7 +129,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.3.0 + uses: azure/setup-helm@v4 - name: Add rstudio helm repo run: helm repo add rstudio https://helm.rstudio.com @@ -139,7 +139,7 @@ jobs: python-version: "3.10" - name: Set up chart-testing - uses: helm/chart-testing-action@v2.7.0 + uses: helm/chart-testing-action@v2 - name: Run chart-testing (list-changed) id: list-changed @@ -219,7 +219,7 @@ jobs: fetch-depth: 0 - name: Set up Helm - uses: azure/setup-helm@v4.3.0 + uses: azure/setup-helm@v4 - uses: extractions/setup-just@v2