From 552fe8c56e349f7a8366f7a0e2d95de39b59b1a3 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Mon, 14 Sep 2026 20:28:17 +0200 Subject: [PATCH] refactor(templates): move the templates out of the `gitea` subdirectory The `templates/gitea` subdirectory did not group anything meaningful, since every template of this chart belongs to Gitea. It only duplicated the chart name in every path and forced the unit tests to spell out `templates/gitea/.yaml`, while `_helpers.tpl` and `NOTES.txt` already lived directly in `templates`. All templates now live in `templates`, which matches the layout of the bundled sub-charts and the Helm defaults. The checksum helper in `templates/_secrets.tpl` built its include path from `$root.Template.BasePath` and therefore carried the subdirectory in a `printf` format string instead of a literal path. Without adjusting it the chart failed to render with "no template gitea/templates/gitea/secret_config.yaml associated with template gotpl". Co-authored-by: Copilot --- .github/copilot-instructions.md | 2 +- README.md | 4 +- templates/{gitea => }/_backendTLSPolicies.tpl | 0 .../{gitea => }/_clientSettingsPolicies.tpl | 0 templates/{gitea => }/_deployments.tpl | 0 templates/{gitea => }/_httpRoutes.tpl | 0 templates/{gitea => }/_ingresses.tpl | 0 templates/{gitea => }/_initContainers.tpl | 0 .../{gitea => }/_persistentVolumeClaims.tpl | 0 templates/{gitea => }/_pods.tpl | 0 templates/{gitea => }/_secrets.tpl | 2 +- templates/{gitea => }/_serviceAccounts.tpl | 0 templates/{gitea => }/_services.tpl | 0 templates/{gitea => }/_tcpRoutes.tpl | 0 templates/{gitea => }/backendTLSPolicy.yaml | 0 .../{gitea => }/clientSettingsPolicy.yaml | 0 templates/{gitea => }/deployment.yaml | 0 templates/{gitea => }/deprecation.yaml | 0 templates/{gitea => }/extra-list.yaml | 0 templates/{gitea => }/httpRoute.yaml | 0 templates/{gitea => }/ingress.yaml | 0 .../{gitea => }/persistentVolumeClaim.yaml | 0 .../{gitea => }/podDisruptionBudget.yaml | 0 templates/{gitea => }/route.yaml | 0 templates/{gitea => }/secret_admin.yaml | 0 templates/{gitea => }/secret_config.yaml | 0 templates/{gitea => }/secret_gpg.yaml | 0 templates/{gitea => }/secret_init.yaml | 0 .../{gitea => }/secret_inlineConfig.yaml | 0 templates/{gitea => }/secret_metrics.yaml | 0 templates/{gitea => }/serviceAccount.yaml | 0 templates/{gitea => }/serviceMonitor.yaml | 0 templates/{gitea => }/service_http.yaml | 0 templates/{gitea => }/service_ssh.yaml | 0 templates/{gitea => }/tcpRoute.yaml | 0 unittests/helm/admin-secret/admin.yaml | 2 +- unittests/helm/config/actions-config.yaml | 6 +- unittests/helm/config/cache-config.yaml | 6 +- .../config/config-environment-script.yaml | 6 +- .../config/metrics-section_metrics-token.yaml | 8 +- unittests/helm/config/queue-config.yaml | 6 +- .../helm/config/server-section_domain.yaml | 14 ++-- unittests/helm/config/session-config.yaml | 6 +- ...customization-integrity-postgresql-ha.yaml | 6 +- .../customization-integrity-postgresql.yaml | 6 +- .../customization-integrity-valkey.yaml | 4 +- unittests/helm/deployment/HA.yaml | 22 +++--- unittests/helm/deployment/admin.yaml | 22 +++--- unittests/helm/deployment/basic.yaml | 78 +++++++++---------- .../helm/deployment/checksum-annotations.yaml | 22 +++--- .../deployment-additional-config.yaml | 24 +++--- unittests/helm/deployment/deprecations.yaml | 2 +- .../helm/deployment/extraEnvSourceFile.yaml | 24 +++--- .../helm/deployment/extraInitContainers.yaml | 38 ++++----- .../helm/deployment/image-configuration.yaml | 36 ++++----- .../initContainerConfiguration.yaml | 28 +++---- unittests/helm/deployment/inline-config.yaml | 2 +- unittests/helm/deployment/openshift.yaml | 22 +++--- unittests/helm/deployment/probes.yaml | 34 ++++---- .../helm/deployment/sidecar-container.yaml | 16 ++-- .../helm/deployment/signing-disabled.yaml | 22 +++--- .../helm/deployment/signing-enabled.yaml | 26 +++---- .../helm/deployment/ssh-configuration.yaml | 24 +++--- .../storage-class-configuration.yaml | 2 +- .../helm/deployment/svc-configuration.yaml | 22 +++--- .../helm/gatewayAPI/backendTLSPolicy.yaml | 2 +- .../helm/gatewayAPI/clientSettingsPolicy.yaml | 2 +- unittests/helm/gatewayAPI/httpRoute.yaml | 2 +- unittests/helm/gatewayAPI/tcpRoute.yaml | 2 +- .../helm/gpg-secret/signing-disabled.yaml | 2 +- .../helm/gpg-secret/signing-enabled.yaml | 2 +- unittests/helm/ingress/ingress.yaml | 2 +- unittests/helm/init/basic.yaml | 2 +- .../init_directory_structure.sh-rootless.yaml | 4 +- .../init/init_directory_structure.sh.yaml | 2 +- ...etrics-secret-servicemonitor-disabled.yaml | 2 +- ...metrics-secret-servicemonitor-enabled.yaml | 2 +- .../persistentVolumeClaim.yaml | 2 +- unittests/helm/route/basic.yaml | 2 +- .../helm/serviceAccount/serviceAccount.yaml | 2 +- unittests/helm/servicemonitor/basic.yaml | 2 +- .../servicemonitor-disabled.yaml | 2 +- .../servicemonitor-enabled.yaml | 2 +- 83 files changed, 291 insertions(+), 291 deletions(-) rename templates/{gitea => }/_backendTLSPolicies.tpl (100%) rename templates/{gitea => }/_clientSettingsPolicies.tpl (100%) rename templates/{gitea => }/_deployments.tpl (100%) rename templates/{gitea => }/_httpRoutes.tpl (100%) rename templates/{gitea => }/_ingresses.tpl (100%) rename templates/{gitea => }/_initContainers.tpl (100%) rename templates/{gitea => }/_persistentVolumeClaims.tpl (100%) rename templates/{gitea => }/_pods.tpl (100%) rename templates/{gitea => }/_secrets.tpl (98%) rename templates/{gitea => }/_serviceAccounts.tpl (100%) rename templates/{gitea => }/_services.tpl (100%) rename templates/{gitea => }/_tcpRoutes.tpl (100%) rename templates/{gitea => }/backendTLSPolicy.yaml (100%) rename templates/{gitea => }/clientSettingsPolicy.yaml (100%) rename templates/{gitea => }/deployment.yaml (100%) rename templates/{gitea => }/deprecation.yaml (100%) rename templates/{gitea => }/extra-list.yaml (100%) rename templates/{gitea => }/httpRoute.yaml (100%) rename templates/{gitea => }/ingress.yaml (100%) rename templates/{gitea => }/persistentVolumeClaim.yaml (100%) rename templates/{gitea => }/podDisruptionBudget.yaml (100%) rename templates/{gitea => }/route.yaml (100%) rename templates/{gitea => }/secret_admin.yaml (100%) rename templates/{gitea => }/secret_config.yaml (100%) rename templates/{gitea => }/secret_gpg.yaml (100%) rename templates/{gitea => }/secret_init.yaml (100%) rename templates/{gitea => }/secret_inlineConfig.yaml (100%) rename templates/{gitea => }/secret_metrics.yaml (100%) rename templates/{gitea => }/serviceAccount.yaml (100%) rename templates/{gitea => }/serviceMonitor.yaml (100%) rename templates/{gitea => }/service_http.yaml (100%) rename templates/{gitea => }/service_ssh.yaml (100%) rename templates/{gitea => }/tcpRoute.yaml (100%) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 0ae3f99..837e6ce 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -34,7 +34,7 @@ image: ### Templates -- Helm templates live in `templates/gitea/`. Helpers live in `templates/_helpers.tpl`. +- Helm templates live in `templates/`. Helpers live in `templates/_helpers.tpl`. - Use camelCase for all files and variables (e.g `httpRoute`, `backendTLSPolicy`, `gatewayAPI`, `statefulSet`). - Use `include "gitea.fullname"` for naming resources. - Use `fail` for required-value validation with clear error messages referencing the full values path. diff --git a/README.md b/README.md index e8001f2..db5fbc2 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,7 @@ If `.Values.deployment.gitea.image.rootless: true`, then the following will occu - `$HOME` becomes `/data/gitea/git` - [see deployment.yaml](./templates/gitea/deployment.yaml) template inside (init-)container "env" declarations + [see deployment.yaml](./templates/deployment.yaml) template inside (init-)container "env" declarations - `START_SSH_SERVER: true` (Unless explicity overwritten by `gitea.config.server.START_SSH_SERVER`) @@ -279,7 +279,7 @@ If `.Values.deployment.gitea.image.rootless: true`, then the following will occu - `SSH_LOG_LEVEL` environment variable is not injected into the container - [see deployment.yaml](./templates/gitea/deployment.yaml) template inside container "env" declarations + [see deployment.yaml](./templates/deployment.yaml) template inside container "env" declarations #### OpenShift Compatibility diff --git a/templates/gitea/_backendTLSPolicies.tpl b/templates/_backendTLSPolicies.tpl similarity index 100% rename from templates/gitea/_backendTLSPolicies.tpl rename to templates/_backendTLSPolicies.tpl diff --git a/templates/gitea/_clientSettingsPolicies.tpl b/templates/_clientSettingsPolicies.tpl similarity index 100% rename from templates/gitea/_clientSettingsPolicies.tpl rename to templates/_clientSettingsPolicies.tpl diff --git a/templates/gitea/_deployments.tpl b/templates/_deployments.tpl similarity index 100% rename from templates/gitea/_deployments.tpl rename to templates/_deployments.tpl diff --git a/templates/gitea/_httpRoutes.tpl b/templates/_httpRoutes.tpl similarity index 100% rename from templates/gitea/_httpRoutes.tpl rename to templates/_httpRoutes.tpl diff --git a/templates/gitea/_ingresses.tpl b/templates/_ingresses.tpl similarity index 100% rename from templates/gitea/_ingresses.tpl rename to templates/_ingresses.tpl diff --git a/templates/gitea/_initContainers.tpl b/templates/_initContainers.tpl similarity index 100% rename from templates/gitea/_initContainers.tpl rename to templates/_initContainers.tpl diff --git a/templates/gitea/_persistentVolumeClaims.tpl b/templates/_persistentVolumeClaims.tpl similarity index 100% rename from templates/gitea/_persistentVolumeClaims.tpl rename to templates/_persistentVolumeClaims.tpl diff --git a/templates/gitea/_pods.tpl b/templates/_pods.tpl similarity index 100% rename from templates/gitea/_pods.tpl rename to templates/_pods.tpl diff --git a/templates/gitea/_secrets.tpl b/templates/_secrets.tpl similarity index 98% rename from templates/gitea/_secrets.tpl rename to templates/_secrets.tpl index fc17628..2c8480e 100644 --- a/templates/gitea/_secrets.tpl +++ b/templates/_secrets.tpl @@ -54,7 +54,7 @@ Arguments: (list $root $key) {{- $name := include (printf "gitea.secret.%s.name" $key) $root -}} {{- lookup "v1" "Secret" $namespace $name | toYaml | sha256sum -}} {{- else -}} -{{- include (printf "%s/gitea/secret_%s.yaml" $root.Template.BasePath $key) $root | sha256sum -}} +{{- include (printf "%s/secret_%s.yaml" $root.Template.BasePath $key) $root | sha256sum -}} {{- end -}} {{- end }} diff --git a/templates/gitea/_serviceAccounts.tpl b/templates/_serviceAccounts.tpl similarity index 100% rename from templates/gitea/_serviceAccounts.tpl rename to templates/_serviceAccounts.tpl diff --git a/templates/gitea/_services.tpl b/templates/_services.tpl similarity index 100% rename from templates/gitea/_services.tpl rename to templates/_services.tpl diff --git a/templates/gitea/_tcpRoutes.tpl b/templates/_tcpRoutes.tpl similarity index 100% rename from templates/gitea/_tcpRoutes.tpl rename to templates/_tcpRoutes.tpl diff --git a/templates/gitea/backendTLSPolicy.yaml b/templates/backendTLSPolicy.yaml similarity index 100% rename from templates/gitea/backendTLSPolicy.yaml rename to templates/backendTLSPolicy.yaml diff --git a/templates/gitea/clientSettingsPolicy.yaml b/templates/clientSettingsPolicy.yaml similarity index 100% rename from templates/gitea/clientSettingsPolicy.yaml rename to templates/clientSettingsPolicy.yaml diff --git a/templates/gitea/deployment.yaml b/templates/deployment.yaml similarity index 100% rename from templates/gitea/deployment.yaml rename to templates/deployment.yaml diff --git a/templates/gitea/deprecation.yaml b/templates/deprecation.yaml similarity index 100% rename from templates/gitea/deprecation.yaml rename to templates/deprecation.yaml diff --git a/templates/gitea/extra-list.yaml b/templates/extra-list.yaml similarity index 100% rename from templates/gitea/extra-list.yaml rename to templates/extra-list.yaml diff --git a/templates/gitea/httpRoute.yaml b/templates/httpRoute.yaml similarity index 100% rename from templates/gitea/httpRoute.yaml rename to templates/httpRoute.yaml diff --git a/templates/gitea/ingress.yaml b/templates/ingress.yaml similarity index 100% rename from templates/gitea/ingress.yaml rename to templates/ingress.yaml diff --git a/templates/gitea/persistentVolumeClaim.yaml b/templates/persistentVolumeClaim.yaml similarity index 100% rename from templates/gitea/persistentVolumeClaim.yaml rename to templates/persistentVolumeClaim.yaml diff --git a/templates/gitea/podDisruptionBudget.yaml b/templates/podDisruptionBudget.yaml similarity index 100% rename from templates/gitea/podDisruptionBudget.yaml rename to templates/podDisruptionBudget.yaml diff --git a/templates/gitea/route.yaml b/templates/route.yaml similarity index 100% rename from templates/gitea/route.yaml rename to templates/route.yaml diff --git a/templates/gitea/secret_admin.yaml b/templates/secret_admin.yaml similarity index 100% rename from templates/gitea/secret_admin.yaml rename to templates/secret_admin.yaml diff --git a/templates/gitea/secret_config.yaml b/templates/secret_config.yaml similarity index 100% rename from templates/gitea/secret_config.yaml rename to templates/secret_config.yaml diff --git a/templates/gitea/secret_gpg.yaml b/templates/secret_gpg.yaml similarity index 100% rename from templates/gitea/secret_gpg.yaml rename to templates/secret_gpg.yaml diff --git a/templates/gitea/secret_init.yaml b/templates/secret_init.yaml similarity index 100% rename from templates/gitea/secret_init.yaml rename to templates/secret_init.yaml diff --git a/templates/gitea/secret_inlineConfig.yaml b/templates/secret_inlineConfig.yaml similarity index 100% rename from templates/gitea/secret_inlineConfig.yaml rename to templates/secret_inlineConfig.yaml diff --git a/templates/gitea/secret_metrics.yaml b/templates/secret_metrics.yaml similarity index 100% rename from templates/gitea/secret_metrics.yaml rename to templates/secret_metrics.yaml diff --git a/templates/gitea/serviceAccount.yaml b/templates/serviceAccount.yaml similarity index 100% rename from templates/gitea/serviceAccount.yaml rename to templates/serviceAccount.yaml diff --git a/templates/gitea/serviceMonitor.yaml b/templates/serviceMonitor.yaml similarity index 100% rename from templates/gitea/serviceMonitor.yaml rename to templates/serviceMonitor.yaml diff --git a/templates/gitea/service_http.yaml b/templates/service_http.yaml similarity index 100% rename from templates/gitea/service_http.yaml rename to templates/service_http.yaml diff --git a/templates/gitea/service_ssh.yaml b/templates/service_ssh.yaml similarity index 100% rename from templates/gitea/service_ssh.yaml rename to templates/service_ssh.yaml diff --git a/templates/gitea/tcpRoute.yaml b/templates/tcpRoute.yaml similarity index 100% rename from templates/gitea/tcpRoute.yaml rename to templates/tcpRoute.yaml diff --git a/unittests/helm/admin-secret/admin.yaml b/unittests/helm/admin-secret/admin.yaml index 10e0eb8..8b04eb4 100644 --- a/unittests/helm/admin-secret/admin.yaml +++ b/unittests/helm/admin-secret/admin.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_admin.yaml + - templates/secret_admin.yaml tests: - it: skips rendering when the admin user is disabled set: diff --git a/unittests/helm/config/actions-config.yaml b/unittests/helm/config/actions-config.yaml index 6101ef4..7851bcf 100644 --- a/unittests/helm/config/actions-config.yaml +++ b/unittests/helm/config/actions-config.yaml @@ -3,17 +3,17 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_inlineConfig.yaml + - templates/secret_inlineConfig.yaml tests: - it: "actions are enabled by default (based on vanilla Gitea behavior)" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 notExists: path: stringData.actions - it: "actions can be disabled via inline config" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea.config.actions.ENABLED: false asserts: diff --git a/unittests/helm/config/cache-config.yaml b/unittests/helm/config/cache-config.yaml index 79a8d85..986e728 100644 --- a/unittests/helm/config/cache-config.yaml +++ b/unittests/helm/config/cache-config.yaml @@ -4,7 +4,7 @@ release: namespace: testing tests: - it: "cache is configured correctly for valkey" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: true @@ -17,7 +17,7 @@ tests: HOST=redis://:changeme@gitea-unittests-valkey.testing.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s& - it: "cache is configured correctly for 'memory' when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false @@ -30,7 +30,7 @@ tests: HOST= - it: "cache can be customized when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false diff --git a/unittests/helm/config/config-environment-script.yaml b/unittests/helm/config/config-environment-script.yaml index ebf1e78..28a1e5d 100644 --- a/unittests/helm/config/config-environment-script.yaml +++ b/unittests/helm/config/config-environment-script.yaml @@ -3,11 +3,11 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml tests: - it: uses `gitea config edit-ini` to write app.ini from environment variables - template: templates/gitea/secret_config.yaml + template: templates/secret_config.yaml asserts: - documentIndex: 0 matchRegex: diff --git a/unittests/helm/config/metrics-section_metrics-token.yaml b/unittests/helm/config/metrics-section_metrics-token.yaml index f530fb5..2b440ff 100644 --- a/unittests/helm/config/metrics-section_metrics-token.yaml +++ b/unittests/helm/config/metrics-section_metrics-token.yaml @@ -4,7 +4,7 @@ release: namespace: testing tests: - it: metrics token is set - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea: metrics: @@ -18,7 +18,7 @@ tests: ENABLED=true TOKEN=somepassword - it: metrics token is empty - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea: metrics: @@ -31,7 +31,7 @@ tests: value: |- ENABLED=true - it: metrics token is nil - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea: metrics: @@ -44,7 +44,7 @@ tests: value: |- ENABLED=true - it: does not configures a token if metrics are disabled - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea: metrics: diff --git a/unittests/helm/config/queue-config.yaml b/unittests/helm/config/queue-config.yaml index 8175955..e862411 100644 --- a/unittests/helm/config/queue-config.yaml +++ b/unittests/helm/config/queue-config.yaml @@ -4,7 +4,7 @@ release: namespace: testing tests: - it: "queue is configured correctly for valkey" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: true @@ -17,7 +17,7 @@ tests: TYPE=redis - it: "queue is configured correctly for 'levelDB' when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false @@ -30,7 +30,7 @@ tests: TYPE=level - it: "queue can be customized when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false diff --git a/unittests/helm/config/server-section_domain.yaml b/unittests/helm/config/server-section_domain.yaml index f177deb..a079959 100644 --- a/unittests/helm/config/server-section_domain.yaml +++ b/unittests/helm/config/server-section_domain.yaml @@ -4,7 +4,7 @@ release: namespace: testing tests: - it: "[default values] uses ingress host for DOMAIN|SSH_DOMAIN|ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: @@ -22,7 +22,7 @@ tests: ################################################ - it: "[no ingress hosts] uses gitea http service for DOMAIN|SSH_DOMAIN|ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: ingress: hosts: [] @@ -43,7 +43,7 @@ tests: ################################################ - it: "[provided via values] uses that for DOMAIN|SSH_DOMAIN|ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: gitea.config.server.DOMAIN: provided.example.com ingress: @@ -69,7 +69,7 @@ tests: ################################################ - it: "[route enabled] uses route host for DOMAIN|SSH_DOMAIN|ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: route: enabled: true @@ -91,7 +91,7 @@ tests: ################################################ - it: "[route tls termination] uses https for ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: route: enabled: true @@ -107,7 +107,7 @@ tests: ################################################ - it: "[HTTPRoute enabled] uses first hostname for DOMAIN|SSH_DOMAIN|ROOT_URL" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: ingress: hosts: [] @@ -137,7 +137,7 @@ tests: ################################################ - it: "[HTTPRoute tls] switches ROOT_URL to https" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: ingress: hosts: [] diff --git a/unittests/helm/config/session-config.yaml b/unittests/helm/config/session-config.yaml index a08ed86..4f5f688 100644 --- a/unittests/helm/config/session-config.yaml +++ b/unittests/helm/config/session-config.yaml @@ -4,7 +4,7 @@ release: namespace: testing tests: - it: "session is configured correctly for valkey" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: true @@ -17,7 +17,7 @@ tests: PROVIDER_CONFIG=redis://:changeme@gitea-unittests-valkey.testing.svc.cluster.local:6379/0?pool_size=100&idle_timeout=180s& - it: "session is configured correctly for 'memory' when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false @@ -30,7 +30,7 @@ tests: PROVIDER_CONFIG= - it: "session can be customized when valkey is disabled" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml set: valkey: enabled: false diff --git a/unittests/helm/dependency-checks/customization-integrity-postgresql-ha.yaml b/unittests/helm/dependency-checks/customization-integrity-postgresql-ha.yaml index 21f93bf..c357740 100644 --- a/unittests/helm/dependency-checks/customization-integrity-postgresql-ha.yaml +++ b/unittests/helm/dependency-checks/customization-integrity-postgresql-ha.yaml @@ -106,7 +106,7 @@ tests: name: gitea-unittests-postgresql-ha-pgpool namespace: testing - it: "[gitea] connects to pgpool service" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: @@ -115,14 +115,14 @@ tests: - it: "[gitea] connects to pgpool service with custom cluster domain" set: clusterDomain: my-special-cluster.local - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: path: stringData.database pattern: HOST=gitea-unittests-postgresql-ha-pgpool.testing.svc.my-special-cluster.local:1234 - it: "[gitea] connects to configured database" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: diff --git a/unittests/helm/dependency-checks/customization-integrity-postgresql.yaml b/unittests/helm/dependency-checks/customization-integrity-postgresql.yaml index 4ffdab7..dfa2094 100644 --- a/unittests/helm/dependency-checks/customization-integrity-postgresql.yaml +++ b/unittests/helm/dependency-checks/customization-integrity-postgresql.yaml @@ -65,7 +65,7 @@ tests: name: gitea-unittests-postgresql namespace: testing - it: "[gitea] connects to postgresql service" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: @@ -74,14 +74,14 @@ tests: - it: "[gitea] connects to postgresql service with custom cluster domain" set: clusterDomain: my-special-cluster.local - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: path: stringData.database pattern: HOST=gitea-unittests-postgresql.testing.svc.my-special-cluster.local:1234 - it: "[gitea] connects to configured database" - template: templates/gitea/secret_inlineConfig.yaml + template: templates/secret_inlineConfig.yaml asserts: - documentIndex: 0 matchRegex: diff --git a/unittests/helm/dependency-checks/customization-integrity-valkey.yaml b/unittests/helm/dependency-checks/customization-integrity-valkey.yaml index ff2c1a7..4b32674 100644 --- a/unittests/helm/dependency-checks/customization-integrity-valkey.yaml +++ b/unittests/helm/dependency-checks/customization-integrity-valkey.yaml @@ -35,7 +35,7 @@ tests: targetPort: tcp protocol: TCP - it: "[gitea] waits for valkey to be up and running" - template: templates/gitea/secret_init.yaml + template: templates/secret_init.yaml asserts: - documentIndex: 0 matchRegex: @@ -44,7 +44,7 @@ tests: - it: "[gitea] waits for valkey to be up and running with custom cluster domain" set: clusterDomain: my-special-cluster.local - template: templates/gitea/secret_init.yaml + template: templates/secret_init.yaml asserts: - documentIndex: 0 matchRegex: diff --git a/unittests/helm/deployment/HA.yaml b/unittests/helm/deployment/HA.yaml index 0ab739d..6a7cbc3 100644 --- a/unittests/helm/deployment/HA.yaml +++ b/unittests/helm/deployment/HA.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: fails with multiple replicas and "GIT_GC_REPOS" enabled - template: templates/gitea/secret_config.yaml + template: templates/secret_config.yaml set: deployment: replicas: 2 @@ -29,7 +29,7 @@ tests: - failedTemplate: errorMessage: "Invoking the garbage collector via CRON is not yet supported when running with multiple replicas. Please set 'gitea.config.cron.GIT_GC_REPOS.enabled = false'." - it: fails with multiple replicas and RWX file system not set - template: templates/gitea/secret_config.yaml + template: templates/secret_config.yaml set: deployment: replicas: 2 @@ -37,7 +37,7 @@ tests: - failedTemplate: errorMessage: "When using multiple replicas, a RWX file system is required and persistence.new.accessModes[0] must be set to ReadWriteMany." - it: fails with multiple replicas and bleve issue indexer - template: templates/gitea/secret_config.yaml + template: templates/secret_config.yaml set: deployment: replicas: 2 @@ -53,7 +53,7 @@ tests: - failedTemplate: errorMessage: "When using multiple replicas, the issue indexer (gitea.config.indexer.ISSUE_INDEXER_TYPE) must be set to a HA-ready provider such as 'meilisearch', 'elasticsearch' or 'db' (if the DB is HA-ready)." - it: fails with multiple replicas and bleve repo indexer - template: templates/gitea/secret_config.yaml + template: templates/secret_config.yaml set: deployment: replicas: 2 diff --git a/unittests/helm/deployment/admin.yaml b/unittests/helm/deployment/admin.yaml index 383b3da..4187a14 100644 --- a/unittests/helm/deployment/admin.yaml +++ b/unittests/helm/deployment/admin.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: reads the admin credentials from the generated secret - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - contains: path: spec.template.spec.initContainers[2].env @@ -45,7 +45,7 @@ tests: value: keepUpdated - it: reads the admin credentials from the configured keys of an existing secret - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.existingSecret.enabled: true secrets.admin.existingSecret.secretName: custom-admin-secret @@ -79,7 +79,7 @@ tests: name: custom-admin-secret - it: omits the admin environment when the admin user is disabled - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.enabled: false asserts: @@ -95,7 +95,7 @@ tests: any: true - it: fails on an unsupported password mode - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.passwordMode: unsupported asserts: diff --git a/unittests/helm/deployment/basic.yaml b/unittests/helm/deployment/basic.yaml index c1a28dc..ed40047 100644 --- a/unittests/helm/deployment/basic.yaml +++ b/unittests/helm/deployment/basic.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: renders a deployment - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - hasDocuments: count: 1 @@ -21,14 +21,14 @@ tests: apiVersion: apps/v1 name: gitea-unittests - it: renders no deployment when disabled - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.enabled: false asserts: - hasDocuments: count: 0 - it: deployment labels are set - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.labels: hello: world @@ -46,7 +46,7 @@ tests: content: hello: world - it: deployment labels are not in selector matchLabels - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.labels: custom-label: custom-value @@ -58,7 +58,7 @@ tests: app.kubernetes.io/name: gitea app.kubernetes.io/instance: gitea-unittests - it: deployment labels are always rendered - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - isSubset: path: metadata.labels @@ -68,12 +68,12 @@ tests: app.kubernetes.io/instance: gitea-unittests app.kubernetes.io/managed-by: Helm - it: deployment annotations are undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: metadata.annotations - it: deployment annotations are set - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.annotations: hello: world @@ -86,7 +86,7 @@ tests: asserts: - notExists: path: spec.template.spec.nodeSelector - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - it: nodeSelector is defined set: deployment.nodeSelector: @@ -98,14 +98,14 @@ tests: content: foo: bar bar: foo - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - it: affinity is undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.affinity - it: affinity is defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.affinity: nodeAffinity: @@ -129,12 +129,12 @@ tests: values: - linux - it: dnsConfig is undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.dnsConfig - it: dnsConfig is defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.dnsConfig: nameservers: @@ -152,12 +152,12 @@ tests: - name: ndots value: "2" - it: priorityClassName is undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.priorityClassName - it: priorityClassName is defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.priorityClassName: high-priority asserts: @@ -165,12 +165,12 @@ tests: path: spec.template.spec.priorityClassName value: high-priority - it: schedulerName is undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.schedulerName - it: schedulerName is defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.schedulerName: stork asserts: @@ -178,7 +178,7 @@ tests: path: spec.template.spec.schedulerName value: stork - it: strategy defaults to a rolling update - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - equal: path: spec.strategy @@ -188,7 +188,7 @@ tests: maxUnavailable: 0 maxSurge: 100% - it: strategy omits rollingUpdate for other strategy types - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.strategy.type: Recreate asserts: @@ -197,12 +197,12 @@ tests: value: type: Recreate - it: tolerations are undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.tolerations - it: tolerations are defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.tolerations: - key: database/type @@ -218,12 +218,12 @@ tests: value: postgres effect: NoSchedule - it: topologySpreadConstraints are undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.topologySpreadConstraints - it: topologySpreadConstraints are defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.topologySpreadConstraints: - topologyKey: kubernetes.io/hostname @@ -244,7 +244,7 @@ tests: app.kubernetes.io/instance: gitea-unittests - it: "injects TMP_EXISTING_ENVS_FILE as environment variable to 'init-app-ini' init container" - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - contains: path: spec.template.spec.initContainers[1].env @@ -252,7 +252,7 @@ tests: name: TMP_EXISTING_ENVS_FILE value: /tmp/existing-envs - it: "injects ENV_TO_INI_MOUNT_POINT as environment variable to 'init-app-ini' init container" - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - contains: path: spec.template.spec.initContainers[1].env @@ -260,7 +260,7 @@ tests: name: ENV_TO_INI_MOUNT_POINT value: /env-to-ini-mounts - it: "deployment.gitea.env is injected into all init containers and the gitea container" - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.env: - name: VARIABLE @@ -287,7 +287,7 @@ tests: name: VARIABLE value: my-value - it: CPU resources are defined as well as GOMAXPROCS - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.resources: limits: @@ -315,7 +315,7 @@ tests: cpu: 100ms memory: 100Mi - it: container resources default to an empty map and GOMAXPROCS is omitted - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - equal: path: spec.template.spec.containers[0].resources @@ -329,12 +329,12 @@ tests: divisor: "1" resource: limits.cpu - it: pod level resources are undefined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.resources - it: pod level resources are defined - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.resources: limits: @@ -354,7 +354,7 @@ tests: cpu: 250m memory: 256Mi - it: Init containers have correct volumeMount path - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: initContainersScriptsVolumeMountPath: "/custom/init/path" asserts: @@ -365,7 +365,7 @@ tests: path: spec.template.spec.initContainers[*].volumeMounts[?(@.name=="config")].mountPath value: "/custom/init/path" - it: Init containers have correct volumeMount path if there is no override - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - equal: path: spec.template.spec.initContainers[*].volumeMounts[?(@.name=="init")].mountPath diff --git a/unittests/helm/deployment/checksum-annotations.yaml b/unittests/helm/deployment/checksum-annotations.yaml index 3e0acda..38f1c7f 100644 --- a/unittests/helm/deployment/checksum-annotations.yaml +++ b/unittests/helm/deployment/checksum-annotations.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: omits the checksum annotations by default - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.enabled: true secrets.config.enabled: true @@ -38,7 +38,7 @@ tests: path: spec.template.metadata.annotations["checksum/metrics"] - it: adds a checksum annotation for every Secret when addSHASumAnnotation is enabled - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.addSHASumAnnotation: true secrets.admin.enabled: true @@ -75,7 +75,7 @@ tests: path: spec.template.metadata.annotations["checksum/metrics"] - it: omits the checksum annotation of a single disabled Secret only - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.addSHASumAnnotation: false secrets.admin.enabled: true @@ -112,7 +112,7 @@ tests: path: spec.template.metadata.annotations["checksum/metrics"] - it: adds the checksum of Secrets provided by the user - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.admin.enabled: true secrets.admin.addSHASumAnnotation: true diff --git a/unittests/helm/deployment/deployment-additional-config.yaml b/unittests/helm/deployment/deployment-additional-config.yaml index b31e533..32fb78e 100644 --- a/unittests/helm/deployment/deployment-additional-config.yaml +++ b/unittests/helm/deployment/deployment-additional-config.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: Renders a deployment - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - hasDocuments: count: 1 @@ -21,7 +21,7 @@ tests: apiVersion: apps/v1 name: gitea-unittests - it: Deployment with empty additionalConfigFromEnvs - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea.additionalConfigFromEnvs: [] asserts: @@ -49,7 +49,7 @@ tests: - name: ENV_TO_INI_MOUNT_POINT value: /env-to-ini-mounts - it: Deployment with standard additionalConfigFromEnvs - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea.additionalConfigFromEnvs: [{name: GITEA_database_HOST, value: my-db:123}, {name: GITEA_database_USER, value: my-user}] asserts: @@ -81,7 +81,7 @@ tests: - name: GITEA_database_USER value: my-user - it: Deployment with templated additionalConfigFromEnvs - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea.misc.host: my-db-host:321 gitea.misc.user: my-db-user @@ -115,7 +115,7 @@ tests: - name: GITEA_database_USER value: my-db-user - it: Deployment with additionalConfigFromEnvs templated secret name - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea.misc.existingSecret: my-db-secret gitea.additionalConfigFromEnvs[0]: diff --git a/unittests/helm/deployment/deprecations.yaml b/unittests/helm/deployment/deprecations.yaml index ac555c6..2a4a5b5 100644 --- a/unittests/helm/deployment/deprecations.yaml +++ b/unittests/helm/deployment/deprecations.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deprecation.yaml + - templates/deprecation.yaml tests: - it: renders nothing with the default values asserts: diff --git a/unittests/helm/deployment/extraEnvSourceFile.yaml b/unittests/helm/deployment/extraEnvSourceFile.yaml index 03a9e8e..dbfc8e7 100644 --- a/unittests/helm/deployment/extraEnvSourceFile.yaml +++ b/unittests/helm/deployment/extraEnvSourceFile.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: uses direct execution when extraEnvSourceFile is not set - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - equal: path: spec.template.spec.initContainers[1].command @@ -26,7 +26,7 @@ tests: path: spec.template.spec.initContainers[2].args - it: sources env file in init-app-ini when extraEnvSourceFile is set - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: extraEnvSourceFile: /vault/secrets/gitea @@ -42,7 +42,7 @@ tests: pattern: config_environment\.sh - it: sources env file in configure-gitea when extraEnvSourceFile is set - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: extraEnvSourceFile: /vault/secrets/gitea @@ -58,7 +58,7 @@ tests: pattern: configure_gitea\.sh - it: sources env file in configure-gpg when extraEnvSourceFile is set with signing enabled - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true @@ -77,7 +77,7 @@ tests: pattern: configure_gpg_environment\.sh - it: includes file existence check in source command - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: extraEnvSourceFile: /vault/secrets/gitea diff --git a/unittests/helm/deployment/extraInitContainers.yaml b/unittests/helm/deployment/extraInitContainers.yaml index 0cbecf8..e749417 100644 --- a/unittests/helm/deployment/extraInitContainers.yaml +++ b/unittests/helm/deployment/extraInitContainers.yaml @@ -3,23 +3,23 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: Render the deployment (default) asserts: - hasDocuments: count: 1 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - lengthEqual: path: spec.template.spec.initContainers count: 3 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - it: Render the deployment (signing) set: @@ -29,11 +29,11 @@ tests: asserts: - hasDocuments: count: 1 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - lengthEqual: path: spec.template.spec.initContainers count: 4 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - it: Render the deployment (extraInitContainers) set: @@ -54,22 +54,22 @@ tests: asserts: - hasDocuments: count: 1 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - lengthEqual: path: spec.template.spec.initContainers count: 6 - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - equal: path: spec.template.spec.initContainers[0].name value: bar - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - equal: path: spec.template.spec.initContainers[5].name value: foo - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml - it: renders the chart-managed init containers in the configured order - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initContainers: - link: "initConfigureGitea" @@ -83,7 +83,7 @@ tests: value: init-directories - it: fails when an init container entry sets both container and link - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initContainers: - link: "initDirectories" @@ -95,7 +95,7 @@ tests: errorMessage: "deployment.initContainers[0]: `container` and `link` are mutually exclusive" - it: fails when an init container entry sets neither container nor link - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initContainers: - name: foo @@ -104,7 +104,7 @@ tests: errorMessage: "deployment.initContainers[0]: either `container` or `link` must be set" - it: fails when an init container links to an unknown configuration - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initContainers: - link: "initSomething" diff --git a/unittests/helm/deployment/image-configuration.yaml b/unittests/helm/deployment/image-configuration.yaml index d463cd9..d913330 100644 --- a/unittests/helm/deployment/image-configuration.yaml +++ b/unittests/helm/deployment/image-configuration.yaml @@ -6,22 +6,22 @@ chart: # Override appVersion to be consistent with used digest :) appVersion: 1.19.3 templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: default values - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - equal: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.3-rootless" - it: tag override - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.tag: "1.19.4" asserts: @@ -29,7 +29,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.4-rootless" - it: root-based image - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.rootless: false asserts: @@ -37,7 +37,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.3" - it: scoped registry - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.registry: "example.com" asserts: @@ -45,7 +45,7 @@ tests: path: spec.template.spec.containers[0].image value: "example.com/gitea:1.19.3-rootless" - it: global registry - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: global.imageRegistry: "global.example.com" asserts: @@ -53,7 +53,7 @@ tests: path: spec.template.spec.containers[0].image value: "global.example.com/gitea:1.19.3-rootless" - it: digest for rootless image - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment: gitea: @@ -65,7 +65,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" - it: image fullOverride (does not append rootless) - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment: gitea: @@ -82,7 +82,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.3" - it: digest for root-based image - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment: gitea: @@ -94,7 +94,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.19.3@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" - it: digest and global registry - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: global.imageRegistry: "global.example.com" deployment.gitea.image.digest: "sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" @@ -103,7 +103,7 @@ tests: path: spec.template.spec.containers[0].image value: "global.example.com/gitea:1.19.3-rootless@sha256:b28e8f3089b52ebe6693295df142f8c12eff354e9a4a5bfbb5c10f296c3a537a" - it: correctly renders floating tag references - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: # use non-quoted values on purpose. See: https://gitea.com/gitea/helm-gitea/issues/631 deployment.gitea.image.tag: 1.21 @@ -124,7 +124,7 @@ tests: path: spec.template.spec.containers[0].image value: "docker.gitea.com/gitea:1.21-rootless" - it: init containers use their own image configuration - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initDirectories.image.registry: "init.example.com" deployment.initDirectories.image.tag: "1.19.4" diff --git a/unittests/helm/deployment/initContainerConfiguration.yaml b/unittests/helm/deployment/initContainerConfiguration.yaml index c876c57..dea7868 100644 --- a/unittests/helm/deployment/initContainerConfiguration.yaml +++ b/unittests/helm/deployment/initContainerConfiguration.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: appends the per-container env - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initDirectories.env: - name: INIT_DIRECTORIES @@ -38,7 +38,7 @@ tests: value: "1" - it: renders the per-container envFrom - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initAppIni.envFrom: - secretRef: @@ -53,7 +53,7 @@ tests: name: special-secret - it: appends the per-container volumeMounts - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initConfigureGitea.volumeMounts: - name: my-configmap-volume @@ -74,7 +74,7 @@ tests: readOnly: true - it: overrides the resources of a single init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.initDirectories.resources: requests: @@ -94,7 +94,7 @@ tests: memory: 128Mi - it: overrides the security context of a single init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.securityContext: runAsUser: 1000 @@ -109,7 +109,7 @@ tests: value: 1000 - it: renders the envFrom of the gitea container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.envFrom: - configMapRef: @@ -122,7 +122,7 @@ tests: name: special-config - it: omits envFrom when unset - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.containers[0].envFrom diff --git a/unittests/helm/deployment/inline-config.yaml b/unittests/helm/deployment/inline-config.yaml index 59795e2..dc6f97e 100644 --- a/unittests/helm/deployment/inline-config.yaml +++ b/unittests/helm/deployment/inline-config.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_inlineConfig.yaml + - templates/secret_inlineConfig.yaml tests: - it: inline config stringData.server using TPL set: diff --git a/unittests/helm/deployment/openshift.yaml b/unittests/helm/deployment/openshift.yaml index 07f0873..d618b42 100644 --- a/unittests/helm/deployment/openshift.yaml +++ b/unittests/helm/deployment/openshift.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: renders openshift-compatible defaults for chart-managed containers - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: openshift.enabled: true asserts: @@ -62,7 +62,7 @@ tests: type: RuntimeDefault - it: does not force runAsUser 1000 for command init containers on OpenShift - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: openshift.enabled: true secrets.gpg.enabled: true @@ -75,7 +75,7 @@ tests: path: spec.template.spec.initContainers[3].securityContext.runAsUser - it: preserves explicit pod and container security context overrides on OpenShift - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: openshift: enabled: true @@ -103,7 +103,7 @@ tests: value: 1000620000 - it: renders an explicit hostUsers=false override on OpenShift - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: openshift: enabled: true diff --git a/unittests/helm/deployment/probes.yaml b/unittests/helm/deployment/probes.yaml index 63a5df0..6a617b0 100644 --- a/unittests/helm/deployment/probes.yaml +++ b/unittests/helm/deployment/probes.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: renders default liveness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.containers[0].livenessProbe.enabled @@ -27,7 +27,7 @@ tests: port: http timeoutSeconds: 1 - it: renders default readiness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.containers[0].readinessProbe.enabled @@ -42,12 +42,12 @@ tests: port: http timeoutSeconds: 1 - it: does not render a default startup probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notExists: path: spec.template.spec.containers[0].startupProbe - it: allows enabling a startup probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea.startupProbe.enabled: true asserts: @@ -65,7 +65,7 @@ tests: timeoutSeconds: 1 - it: allows overwriting the default port of the liveness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: livenessProbe: @@ -79,7 +79,7 @@ tests: port: my-port - it: allows overwriting the default port of the readiness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: readinessProbe: @@ -93,7 +93,7 @@ tests: port: my-port - it: allows overwriting the default port of the startup probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: startupProbe: @@ -108,7 +108,7 @@ tests: port: my-port - it: allows using a non-default method as liveness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: livenessProbe: @@ -136,7 +136,7 @@ tests: timeoutSeconds: 13372 - it: allows using a non-default method as readiness probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: readinessProbe: @@ -164,7 +164,7 @@ tests: timeoutSeconds: 13372 - it: allows using a non-default method as startup probe - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: gitea: startupProbe: diff --git a/unittests/helm/deployment/sidecar-container.yaml b/unittests/helm/deployment/sidecar-container.yaml index 7a9c72a..cf5bfae 100644 --- a/unittests/helm/deployment/sidecar-container.yaml +++ b/unittests/helm/deployment/sidecar-container.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: supports adding a sidecar container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: extraContainers: - name: sidecar-bob diff --git a/unittests/helm/deployment/signing-disabled.yaml b/unittests/helm/deployment/signing-disabled.yaml index ea73bd1..7f6c7ef 100644 --- a/unittests/helm/deployment/signing-disabled.yaml +++ b/unittests/helm/deployment/signing-disabled.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: skips gpg init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notContains: path: spec.template.spec.initContainers @@ -20,7 +20,7 @@ tests: content: name: configure-gpg - it: skips gpg env in `init-directories` init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: false asserts: @@ -29,14 +29,14 @@ tests: content: name: GNUPGHOME - it: skips gpg env in runtime container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notContains: path: spec.template.spec.containers[0].env content: name: GNUPGHOME - it: skips gpg volume spec - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml asserts: - notContains: path: spec.template.spec.volumes diff --git a/unittests/helm/deployment/signing-enabled.yaml b/unittests/helm/deployment/signing-enabled.yaml index 0bb2787..ef83466 100644 --- a/unittests/helm/deployment/signing-enabled.yaml +++ b/unittests/helm/deployment/signing-enabled.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: adds gpg init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true @@ -49,7 +49,7 @@ tests: mountPath: /raw readOnly: true - it: adds gpg env in `init-directories` init container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true @@ -64,7 +64,7 @@ tests: name: custom-gpg-secret key: gpgHome - it: adds gpg env in runtime container - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true @@ -79,7 +79,7 @@ tests: name: custom-gpg-secret key: gpgHome - it: reads the gpg home from the configured key of an existing secret - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true @@ -95,7 +95,7 @@ tests: name: custom-gpg-secret key: custom-gpg-home - it: adds gpg volume spec - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.new.privateKey: "gpg-key-placeholder" @@ -111,7 +111,7 @@ tests: path: private.asc defaultMode: 0100 - it: supports gpg volume spec with external reference - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: secrets.gpg.enabled: true secrets.gpg.existingSecret.enabled: true diff --git a/unittests/helm/deployment/ssh-configuration.yaml b/unittests/helm/deployment/ssh-configuration.yaml index 99d136f..916d7b4 100644 --- a/unittests/helm/deployment/ssh-configuration.yaml +++ b/unittests/helm/deployment/ssh-configuration.yaml @@ -3,16 +3,16 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/deployment.yaml - - templates/gitea/secret_admin.yaml - - templates/gitea/secret_config.yaml - - templates/gitea/secret_gpg.yaml - - templates/gitea/secret_init.yaml - - templates/gitea/secret_inlineConfig.yaml - - templates/gitea/secret_metrics.yaml + - templates/deployment.yaml + - templates/secret_admin.yaml + - templates/secret_config.yaml + - templates/secret_gpg.yaml + - templates/secret_init.yaml + - templates/secret_inlineConfig.yaml + - templates/secret_metrics.yaml tests: - it: supports defining SSH log level for root based image - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.rootless: false asserts: @@ -22,7 +22,7 @@ tests: name: SSH_LOG_LEVEL value: "INFO" - it: supports overriding SSH log level - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.rootless: false gitea.ssh.logLevel: "DEBUG" @@ -33,7 +33,7 @@ tests: name: SSH_LOG_LEVEL value: "DEBUG" - it: supports overriding SSH log level (even when image.fullOverride set) - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.fullOverride: docker.gitea.com/gitea:1.19.3 deployment.gitea.image.rootless: false @@ -45,7 +45,7 @@ tests: name: SSH_LOG_LEVEL value: "DEBUG" - it: skips SSH_LOG_LEVEL for rootless image - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.rootless: true gitea.ssh.logLevel: "DEBUG" # explicitly defining a non-standard level here @@ -56,7 +56,7 @@ tests: content: name: SSH_LOG_LEVEL - it: skips SSH_LOG_LEVEL for rootless image (even when image.fullOverride set) - template: templates/gitea/deployment.yaml + template: templates/deployment.yaml set: deployment.gitea.image.fullOverride: docker.gitea.com/gitea:1.19.3 deployment.gitea.image.rootless: true diff --git a/unittests/helm/deployment/storage-class-configuration.yaml b/unittests/helm/deployment/storage-class-configuration.yaml index eb5e070..21fd06a 100644 --- a/unittests/helm/deployment/storage-class-configuration.yaml +++ b/unittests/helm/deployment/storage-class-configuration.yaml @@ -5,7 +5,7 @@ release: namespace: testing suite: Storage class configuration tests templates: - - templates/gitea/persistentVolumeClaim.yaml + - templates/persistentVolumeClaim.yaml tests: - it: Set storageClassName when persistence.new.storageClassName is defined set: diff --git a/unittests/helm/deployment/svc-configuration.yaml b/unittests/helm/deployment/svc-configuration.yaml index b76be08..aa9a87b 100644 --- a/unittests/helm/deployment/svc-configuration.yaml +++ b/unittests/helm/deployment/svc-configuration.yaml @@ -3,11 +3,11 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/service_ssh.yaml - - templates/gitea/service_http.yaml + - templates/service_ssh.yaml + - templates/service_http.yaml tests: - it: supports adding custom labels to sshService - template: templates/gitea/service_ssh.yaml + template: templates/service_ssh.yaml set: service: ssh: @@ -19,7 +19,7 @@ tests: value: "testvalue" - it: keeps existing labels (ssh) - template: templates/gitea/service_ssh.yaml + template: templates/service_ssh.yaml set: service: ssh: @@ -29,7 +29,7 @@ tests: path: metadata.labels["app"] - it: supports adding custom labels to httpService - template: templates/gitea/service_http.yaml + template: templates/service_http.yaml set: service: http: @@ -41,7 +41,7 @@ tests: value: "testvalue" - it: keeps existing labels (http) - template: templates/gitea/service_http.yaml + template: templates/service_http.yaml set: service: http: @@ -51,7 +51,7 @@ tests: path: metadata.labels["app"] - it: render service.ssh.loadBalancerClass if set and type is LoadBalancer - template: templates/gitea/service_ssh.yaml + template: templates/service_ssh.yaml set: service: ssh: @@ -73,7 +73,7 @@ tests: value: ["1.2.3.4/32", "5.6.7.8/32"] - it: does not render when loadbalancer properties are set but type is not loadBalancerClass - template: templates/gitea/service_http.yaml + template: templates/service_http.yaml set: service: http: @@ -92,7 +92,7 @@ tests: path: spec.loadBalancerSourceRanges - it: does not render loadBalancerClass by default even when type is LoadBalancer - template: templates/gitea/service_http.yaml + template: templates/service_http.yaml set: service: http: @@ -107,8 +107,8 @@ tests: - it: both ssh and http services exist templates: - - templates/gitea/service_ssh.yaml - - templates/gitea/service_http.yaml + - templates/service_ssh.yaml + - templates/service_http.yaml asserts: - matchRegex: path: metadata.name diff --git a/unittests/helm/gatewayAPI/backendTLSPolicy.yaml b/unittests/helm/gatewayAPI/backendTLSPolicy.yaml index c2681ec..e171b84 100644 --- a/unittests/helm/gatewayAPI/backendTLSPolicy.yaml +++ b/unittests/helm/gatewayAPI/backendTLSPolicy.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/backendTLSPolicy.yaml + - templates/backendTLSPolicy.yaml tests: - it: should not render when gatewayAPI.enabled is false set: diff --git a/unittests/helm/gatewayAPI/clientSettingsPolicy.yaml b/unittests/helm/gatewayAPI/clientSettingsPolicy.yaml index ed275bf..8fe3d40 100644 --- a/unittests/helm/gatewayAPI/clientSettingsPolicy.yaml +++ b/unittests/helm/gatewayAPI/clientSettingsPolicy.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/clientSettingsPolicy.yaml + - templates/clientSettingsPolicy.yaml tests: - it: should not render when gatewayAPI.enabled is false set: diff --git a/unittests/helm/gatewayAPI/httpRoute.yaml b/unittests/helm/gatewayAPI/httpRoute.yaml index fab1b56..4793964 100644 --- a/unittests/helm/gatewayAPI/httpRoute.yaml +++ b/unittests/helm/gatewayAPI/httpRoute.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/httpRoute.yaml + - templates/httpRoute.yaml tests: - it: should not render when gatewayAPI.enabled is false set: diff --git a/unittests/helm/gatewayAPI/tcpRoute.yaml b/unittests/helm/gatewayAPI/tcpRoute.yaml index af5d2d3..12f6dd4 100644 --- a/unittests/helm/gatewayAPI/tcpRoute.yaml +++ b/unittests/helm/gatewayAPI/tcpRoute.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/tcpRoute.yaml + - templates/tcpRoute.yaml tests: - it: should not render when gatewayAPI.enabled is false set: diff --git a/unittests/helm/gpg-secret/signing-disabled.yaml b/unittests/helm/gpg-secret/signing-disabled.yaml index 3604920..d49c034 100644 --- a/unittests/helm/gpg-secret/signing-disabled.yaml +++ b/unittests/helm/gpg-secret/signing-disabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_gpg.yaml + - templates/secret_gpg.yaml tests: - it: renders nothing set: diff --git a/unittests/helm/gpg-secret/signing-enabled.yaml b/unittests/helm/gpg-secret/signing-enabled.yaml index 80d1b98..b97a4c4 100644 --- a/unittests/helm/gpg-secret/signing-enabled.yaml +++ b/unittests/helm/gpg-secret/signing-enabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_gpg.yaml + - templates/secret_gpg.yaml tests: - it: fails rendering when nothing is configured set: diff --git a/unittests/helm/ingress/ingress.yaml b/unittests/helm/ingress/ingress.yaml index 9946718..48d7276 100644 --- a/unittests/helm/ingress/ingress.yaml +++ b/unittests/helm/ingress/ingress.yaml @@ -5,7 +5,7 @@ release: namespace: testing suite: Test ingress.yaml templates: - - templates/gitea/ingress.yaml + - templates/ingress.yaml tests: - it: Skip ingress if ingress is disabled set: diff --git a/unittests/helm/init/basic.yaml b/unittests/helm/init/basic.yaml index 2493b76..94b2905 100644 --- a/unittests/helm/init/basic.yaml +++ b/unittests/helm/init/basic.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_init.yaml + - templates/secret_init.yaml tests: - it: renders a secret asserts: diff --git a/unittests/helm/init/init_directory_structure.sh-rootless.yaml b/unittests/helm/init/init_directory_structure.sh-rootless.yaml index cbdc386..48eaf7e 100644 --- a/unittests/helm/init/init_directory_structure.sh-rootless.yaml +++ b/unittests/helm/init/init_directory_structure.sh-rootless.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_init.yaml + - templates/secret_init.yaml tests: - it: runs gpg in batch mode set: @@ -63,7 +63,7 @@ tests: chown -v 1000:1000 "${GNUPGHOME}" fi - it: it does not chown /data even when image.fullOverride is set - template: templates/gitea/secret_init.yaml + template: templates/secret_init.yaml set: deployment.gitea.image.fullOverride: docker.gitea.com/gitea:1.20.5 asserts: diff --git a/unittests/helm/init/init_directory_structure.sh.yaml b/unittests/helm/init/init_directory_structure.sh.yaml index 29dab9e..cc67bf6 100644 --- a/unittests/helm/init/init_directory_structure.sh.yaml +++ b/unittests/helm/init/init_directory_structure.sh.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_init.yaml + - templates/secret_init.yaml tests: - it: runs gpg in batch mode set: diff --git a/unittests/helm/metric-secret/metrics-secret-servicemonitor-disabled.yaml b/unittests/helm/metric-secret/metrics-secret-servicemonitor-disabled.yaml index 6495867..398c000 100644 --- a/unittests/helm/metric-secret/metrics-secret-servicemonitor-disabled.yaml +++ b/unittests/helm/metric-secret/metrics-secret-servicemonitor-disabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_metrics.yaml + - templates/secret_metrics.yaml tests: - it: renders nothing if monitoring disabled and gitea.metrics.token empty set: diff --git a/unittests/helm/metric-secret/metrics-secret-servicemonitor-enabled.yaml b/unittests/helm/metric-secret/metrics-secret-servicemonitor-enabled.yaml index 3db0810..570ed73 100644 --- a/unittests/helm/metric-secret/metrics-secret-servicemonitor-enabled.yaml +++ b/unittests/helm/metric-secret/metrics-secret-servicemonitor-enabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/secret_metrics.yaml + - templates/secret_metrics.yaml tests: - it: renders nothing if monitoring enabled and gitea.metrics.token empty set: diff --git a/unittests/helm/persistentVolumeClaim/persistentVolumeClaim.yaml b/unittests/helm/persistentVolumeClaim/persistentVolumeClaim.yaml index cb5df4b..bc5c1f7 100644 --- a/unittests/helm/persistentVolumeClaim/persistentVolumeClaim.yaml +++ b/unittests/helm/persistentVolumeClaim/persistentVolumeClaim.yaml @@ -5,7 +5,7 @@ release: namespace: testing suite: PVC template templates: - - templates/gitea/persistentVolumeClaim.yaml + - templates/persistentVolumeClaim.yaml tests: - it: Skip persistentVolumeClaim if persistentVolumeClaim is disabled set: diff --git a/unittests/helm/route/basic.yaml b/unittests/helm/route/basic.yaml index 246d50a..bc473fe 100644 --- a/unittests/helm/route/basic.yaml +++ b/unittests/helm/route/basic.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/route.yaml + - templates/route.yaml tests: - it: should create route when route.enabled is true set: diff --git a/unittests/helm/serviceAccount/serviceAccount.yaml b/unittests/helm/serviceAccount/serviceAccount.yaml index bdbced3..cafc0a9 100644 --- a/unittests/helm/serviceAccount/serviceAccount.yaml +++ b/unittests/helm/serviceAccount/serviceAccount.yaml @@ -5,7 +5,7 @@ release: namespace: testing suite: ServiceAccount template templates: - - templates/gitea/serviceAccount.yaml + - templates/serviceAccount.yaml tests: - it: Render the ServiceAccount by default asserts: diff --git a/unittests/helm/servicemonitor/basic.yaml b/unittests/helm/servicemonitor/basic.yaml index 8851b75..5d67ec6 100644 --- a/unittests/helm/servicemonitor/basic.yaml +++ b/unittests/helm/servicemonitor/basic.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/serviceMonitor.yaml + - templates/serviceMonitor.yaml tests: - it: skips rendering by default asserts: diff --git a/unittests/helm/servicemonitor/servicemonitor-disabled.yaml b/unittests/helm/servicemonitor/servicemonitor-disabled.yaml index be40959..3df211a 100644 --- a/unittests/helm/servicemonitor/servicemonitor-disabled.yaml +++ b/unittests/helm/servicemonitor/servicemonitor-disabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/serviceMonitor.yaml + - templates/serviceMonitor.yaml tests: - it: renders nothing if gitea.metrics.serviceMonitor disabled and gitea.metrics.token empty set: diff --git a/unittests/helm/servicemonitor/servicemonitor-enabled.yaml b/unittests/helm/servicemonitor/servicemonitor-enabled.yaml index 9def6dd..245ff90 100644 --- a/unittests/helm/servicemonitor/servicemonitor-enabled.yaml +++ b/unittests/helm/servicemonitor/servicemonitor-enabled.yaml @@ -3,7 +3,7 @@ release: name: gitea-unittests namespace: testing templates: - - templates/gitea/serviceMonitor.yaml + - templates/serviceMonitor.yaml tests: - it: renders unsecure ServiceMonitor if gitea.metrics.token nil set: