From 6a2bee4036be6e5b81cd8dac40a73b9f5632cbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=E1=B4=87=CA=80=C9=B4=E1=B4=85=20S=E1=B4=84=CA=9C?= =?UTF-8?q?=E1=B4=8F=CA=80=C9=A2=E1=B4=87=CA=80s?= Date: Mon, 8 Aug 2022 15:05:46 +0200 Subject: [PATCH] feat!: Rename common-chart to app-template --- .github/workflows/pr-validate.yaml | 2 +- .../{common-chart => app-template}/.helmignore | 0 .../{common-chart => app-template}/Chart.yaml | 2 +- .../README_CONFIG.md.gotmpl | 0 .../ci/basic-values.yaml | 0 .../ci/codeserver-values.yaml | 0 .../ci/netshoot-values.yaml | 0 .../ci/promtail-values.yaml | 0 .../templates/common.yaml | 0 .../tests/addons/codeserver_test.yaml | 10 +++++----- .../tests/addons/netshoot_test.yaml | 0 .../tests/addons/vpn_test.yaml | 4 ++-- .../tests/configmap/metadata_test.yaml | 12 ++++++------ .../tests/configmap/names_test.yaml | 4 ++-- .../tests/configmap/pod_metadata_test.yaml | 2 +- .../tests/container/args_test.yaml | 0 .../tests/container/command_test.yaml | 0 .../tests/container/env_test.yaml | 0 .../tests/container/envfrom_test.yaml | 2 +- .../tests/container/ports_test.yaml | 0 .../tests/container/volumemounts_test.yaml | 0 .../controller/metadata_daemonset_test.yaml | 12 ++++++------ .../controller/metadata_deployment_test.yaml | 12 ++++++------ .../controller/metadata_statefulset_test.yaml | 12 ++++++------ .../tests/controller/type_test.yaml | 6 +++--- .../tests/ingress/metadata_test.yaml | 12 ++++++------ .../tests/ingress/presence_test.yaml | 0 .../tests/ingress/service_reference_test.yaml | 2 +- .../tests/ingress/tls_test.yaml | 0 .../tests/ingress/values_test.yaml | 0 .../tests/persistence/claimnames_test.yaml | 6 +++--- .../tests/persistence/emptydir_test.yaml | 0 .../tests/persistence/hostpath_test.yaml | 0 .../tests/persistence/types_test.yaml | 2 +- .../persistence/volumeclaimtemplates_test.yaml | 0 .../tests/pod/additionalcontainers_test.yaml | 0 .../tests/pod/initcontainers_test.yaml | 0 .../tests/pod/network_test.yaml | 0 .../tests/pod/replicas_test.yaml | 0 .../tests/pvc/metadata_test.yaml | 16 ++++++++-------- .../tests/pvc/names_test.yaml | 6 +++--- .../tests/pvc/storageclass_test.yaml | 0 .../tests/service/metadata_test.yaml | 12 ++++++------ .../tests/service/names_test.yaml | 4 ++-- .../tests/service/port_names_test.yaml | 0 .../tests/service/port_protocols_test.yaml | 0 .../tests/service/values_test.yaml | 0 .../{common-chart => app-template}/values.yaml | 0 48 files changed, 70 insertions(+), 70 deletions(-) rename charts/other/{common-chart => app-template}/.helmignore (100%) rename charts/other/{common-chart => app-template}/Chart.yaml (95%) rename charts/other/{common-chart => app-template}/README_CONFIG.md.gotmpl (100%) rename charts/other/{common-chart => app-template}/ci/basic-values.yaml (100%) rename charts/other/{common-chart => app-template}/ci/codeserver-values.yaml (100%) rename charts/other/{common-chart => app-template}/ci/netshoot-values.yaml (100%) rename charts/other/{common-chart => app-template}/ci/promtail-values.yaml (100%) rename charts/other/{common-chart => app-template}/templates/common.yaml (100%) rename charts/other/{common-chart => app-template}/tests/addons/codeserver_test.yaml (94%) rename charts/other/{common-chart => app-template}/tests/addons/netshoot_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/addons/vpn_test.yaml (97%) rename charts/other/{common-chart => app-template}/tests/configmap/metadata_test.yaml (88%) rename charts/other/{common-chart => app-template}/tests/configmap/names_test.yaml (94%) rename charts/other/{common-chart => app-template}/tests/configmap/pod_metadata_test.yaml (80%) rename charts/other/{common-chart => app-template}/tests/container/args_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/container/command_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/container/env_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/container/envfrom_test.yaml (95%) rename charts/other/{common-chart => app-template}/tests/container/ports_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/container/volumemounts_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/controller/metadata_daemonset_test.yaml (87%) rename charts/other/{common-chart => app-template}/tests/controller/metadata_deployment_test.yaml (87%) rename charts/other/{common-chart => app-template}/tests/controller/metadata_statefulset_test.yaml (87%) rename charts/other/{common-chart => app-template}/tests/controller/type_test.yaml (90%) rename charts/other/{common-chart => app-template}/tests/ingress/metadata_test.yaml (87%) rename charts/other/{common-chart => app-template}/tests/ingress/presence_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/ingress/service_reference_test.yaml (94%) rename charts/other/{common-chart => app-template}/tests/ingress/tls_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/ingress/values_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/persistence/claimnames_test.yaml (91%) rename charts/other/{common-chart => app-template}/tests/persistence/emptydir_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/persistence/hostpath_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/persistence/types_test.yaml (98%) rename charts/other/{common-chart => app-template}/tests/persistence/volumeclaimtemplates_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/pod/additionalcontainers_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/pod/initcontainers_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/pod/network_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/pod/replicas_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/pvc/metadata_test.yaml (88%) rename charts/other/{common-chart => app-template}/tests/pvc/names_test.yaml (91%) rename charts/other/{common-chart => app-template}/tests/pvc/storageclass_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/service/metadata_test.yaml (87%) rename charts/other/{common-chart => app-template}/tests/service/names_test.yaml (86%) rename charts/other/{common-chart => app-template}/tests/service/port_names_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/service/port_protocols_test.yaml (100%) rename charts/other/{common-chart => app-template}/tests/service/values_test.yaml (100%) rename charts/other/{common-chart => app-template}/values.yaml (100%) diff --git a/.github/workflows/pr-validate.yaml b/.github/workflows/pr-validate.yaml index 413005e1..c8f7102e 100644 --- a/.github/workflows/pr-validate.yaml +++ b/.github/workflows/pr-validate.yaml @@ -54,7 +54,7 @@ jobs: ${{ ( contains(fromJSON(needs.pr-metadata.outputs.addedOrModifiedCharts), 'library/common') && - '["other/common-chart"]' + '["other/app-template"]' ) || '[]' }} overrideDeps: |- diff --git a/charts/other/common-chart/.helmignore b/charts/other/app-template/.helmignore similarity index 100% rename from charts/other/common-chart/.helmignore rename to charts/other/app-template/.helmignore diff --git a/charts/other/common-chart/Chart.yaml b/charts/other/app-template/Chart.yaml similarity index 95% rename from charts/other/common-chart/Chart.yaml rename to charts/other/app-template/Chart.yaml index b6eac021..72560db5 100644 --- a/charts/other/common-chart/Chart.yaml +++ b/charts/other/app-template/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 description: A common powered chart template. This can be useful for small projects that don't have their own chart. -name: common-chart +name: app-template version: 0.1.0 maintainers: - name: bjw-s diff --git a/charts/other/common-chart/README_CONFIG.md.gotmpl b/charts/other/app-template/README_CONFIG.md.gotmpl similarity index 100% rename from charts/other/common-chart/README_CONFIG.md.gotmpl rename to charts/other/app-template/README_CONFIG.md.gotmpl diff --git a/charts/other/common-chart/ci/basic-values.yaml b/charts/other/app-template/ci/basic-values.yaml similarity index 100% rename from charts/other/common-chart/ci/basic-values.yaml rename to charts/other/app-template/ci/basic-values.yaml diff --git a/charts/other/common-chart/ci/codeserver-values.yaml b/charts/other/app-template/ci/codeserver-values.yaml similarity index 100% rename from charts/other/common-chart/ci/codeserver-values.yaml rename to charts/other/app-template/ci/codeserver-values.yaml diff --git a/charts/other/common-chart/ci/netshoot-values.yaml b/charts/other/app-template/ci/netshoot-values.yaml similarity index 100% rename from charts/other/common-chart/ci/netshoot-values.yaml rename to charts/other/app-template/ci/netshoot-values.yaml diff --git a/charts/other/common-chart/ci/promtail-values.yaml b/charts/other/app-template/ci/promtail-values.yaml similarity index 100% rename from charts/other/common-chart/ci/promtail-values.yaml rename to charts/other/app-template/ci/promtail-values.yaml diff --git a/charts/other/common-chart/templates/common.yaml b/charts/other/app-template/templates/common.yaml similarity index 100% rename from charts/other/common-chart/templates/common.yaml rename to charts/other/app-template/templates/common.yaml diff --git a/charts/other/common-chart/tests/addons/codeserver_test.yaml b/charts/other/app-template/tests/addons/codeserver_test.yaml similarity index 94% rename from charts/other/common-chart/tests/addons/codeserver_test.yaml rename to charts/other/app-template/tests/addons/codeserver_test.yaml index 47a80036..c2b16993 100644 --- a/charts/other/common-chart/tests/addons/codeserver_test.yaml +++ b/charts/other/app-template/tests/addons/codeserver_test.yaml @@ -45,7 +45,7 @@ tests: - documentIndex: *AddonServiceDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: addon enabled with deployKey should pass set: @@ -83,11 +83,11 @@ tests: items: - key: id_rsa path: id_rsa - secretName: RELEASE-NAME-common-chart-deploykey + secretName: RELEASE-NAME-app-template-deploykey - documentIndex: *AddonDeployKeySecretDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-deploykey + value: RELEASE-NAME-app-template-deploykey - it: addon enabled with InlineBase64 deployKey should pass set: @@ -125,11 +125,11 @@ tests: items: - key: id_rsa path: id_rsa - secretName: RELEASE-NAME-common-chart-deploykey + secretName: RELEASE-NAME-app-template-deploykey - documentIndex: *AddonDeployKeySecretDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-deploykey + value: RELEASE-NAME-app-template-deploykey - it: addon enabled with existingSecret deployKey should pass set: diff --git a/charts/other/common-chart/tests/addons/netshoot_test.yaml b/charts/other/app-template/tests/addons/netshoot_test.yaml similarity index 100% rename from charts/other/common-chart/tests/addons/netshoot_test.yaml rename to charts/other/app-template/tests/addons/netshoot_test.yaml diff --git a/charts/other/common-chart/tests/addons/vpn_test.yaml b/charts/other/app-template/tests/addons/vpn_test.yaml similarity index 97% rename from charts/other/common-chart/tests/addons/vpn_test.yaml rename to charts/other/app-template/tests/addons/vpn_test.yaml index 664f8baa..905ee2f5 100644 --- a/charts/other/common-chart/tests/addons/vpn_test.yaml +++ b/charts/other/app-template/tests/addons/vpn_test.yaml @@ -68,11 +68,11 @@ tests: items: - key: vpnConfigfile path: vpnConfigfile - secretName: RELEASE-NAME-common-chart-vpnconfig + secretName: RELEASE-NAME-app-template-vpnconfig - documentIndex: *AddonVPNConfigSecretDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-vpnconfig + value: RELEASE-NAME-app-template-vpnconfig - it: addon enabled with existing configFile secret should pass set: diff --git a/charts/other/common-chart/tests/configmap/metadata_test.yaml b/charts/other/app-template/tests/configmap/metadata_test.yaml similarity index 88% rename from charts/other/common-chart/tests/configmap/metadata_test.yaml rename to charts/other/app-template/tests/configmap/metadata_test.yaml index f7f81a29..6aa6afe9 100644 --- a/charts/other/common-chart/tests/configmap/metadata_test.yaml +++ b/charts/other/app-template/tests/configmap/metadata_test.yaml @@ -20,8 +20,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -47,8 +47,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -81,7 +81,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/configmap/names_test.yaml b/charts/other/app-template/tests/configmap/names_test.yaml similarity index 94% rename from charts/other/common-chart/tests/configmap/names_test.yaml rename to charts/other/app-template/tests/configmap/names_test.yaml index a59f9ce6..8230f243 100644 --- a/charts/other/common-chart/tests/configmap/names_test.yaml +++ b/charts/other/app-template/tests/configmap/names_test.yaml @@ -71,7 +71,7 @@ tests: - documentIndex: 0 equal: path: metadata.name - value: RELEASE-NAME-common-chart-config + value: RELEASE-NAME-app-template-config - it: with nameOverride should pass set: @@ -88,4 +88,4 @@ tests: - documentIndex: 0 equal: path: metadata.name - value: RELEASE-NAME-common-chart-http + value: RELEASE-NAME-app-template-http diff --git a/charts/other/common-chart/tests/configmap/pod_metadata_test.yaml b/charts/other/app-template/tests/configmap/pod_metadata_test.yaml similarity index 80% rename from charts/other/common-chart/tests/configmap/pod_metadata_test.yaml rename to charts/other/app-template/tests/configmap/pod_metadata_test.yaml index 25da583d..013e1a31 100644 --- a/charts/other/common-chart/tests/configmap/pod_metadata_test.yaml +++ b/charts/other/app-template/tests/configmap/pod_metadata_test.yaml @@ -15,4 +15,4 @@ tests: equal: path: spec.template.metadata.annotations value: - checksum/config: 3cd90a9f7d2c08b3d9d41d1be650110f4974009dcaf0a3d9e0616c90d80e1d38 + checksum/config: 4ab90b837c946c225b999f7a09f7ace4acd22f5e691b006e0d4c6b97cf34fbd0 diff --git a/charts/other/common-chart/tests/container/args_test.yaml b/charts/other/app-template/tests/container/args_test.yaml similarity index 100% rename from charts/other/common-chart/tests/container/args_test.yaml rename to charts/other/app-template/tests/container/args_test.yaml diff --git a/charts/other/common-chart/tests/container/command_test.yaml b/charts/other/app-template/tests/container/command_test.yaml similarity index 100% rename from charts/other/common-chart/tests/container/command_test.yaml rename to charts/other/app-template/tests/container/command_test.yaml diff --git a/charts/other/common-chart/tests/container/env_test.yaml b/charts/other/app-template/tests/container/env_test.yaml similarity index 100% rename from charts/other/common-chart/tests/container/env_test.yaml rename to charts/other/app-template/tests/container/env_test.yaml diff --git a/charts/other/common-chart/tests/container/envfrom_test.yaml b/charts/other/app-template/tests/container/envfrom_test.yaml similarity index 95% rename from charts/other/common-chart/tests/container/envfrom_test.yaml rename to charts/other/app-template/tests/container/envfrom_test.yaml index 17e1cdf0..a39f240a 100644 --- a/charts/other/common-chart/tests/container/envfrom_test.yaml +++ b/charts/other/app-template/tests/container/envfrom_test.yaml @@ -40,4 +40,4 @@ tests: path: spec.template.spec.containers[0].envFrom[0] value: secretRef: - name: RELEASE-NAME-common-chart + name: RELEASE-NAME-app-template diff --git a/charts/other/common-chart/tests/container/ports_test.yaml b/charts/other/app-template/tests/container/ports_test.yaml similarity index 100% rename from charts/other/common-chart/tests/container/ports_test.yaml rename to charts/other/app-template/tests/container/ports_test.yaml diff --git a/charts/other/common-chart/tests/container/volumemounts_test.yaml b/charts/other/app-template/tests/container/volumemounts_test.yaml similarity index 100% rename from charts/other/common-chart/tests/container/volumemounts_test.yaml rename to charts/other/app-template/tests/container/volumemounts_test.yaml diff --git a/charts/other/common-chart/tests/controller/metadata_daemonset_test.yaml b/charts/other/app-template/tests/controller/metadata_daemonset_test.yaml similarity index 87% rename from charts/other/common-chart/tests/controller/metadata_daemonset_test.yaml rename to charts/other/app-template/tests/controller/metadata_daemonset_test.yaml index c9fdd35d..5bc91de9 100644 --- a/charts/other/common-chart/tests/controller/metadata_daemonset_test.yaml +++ b/charts/other/app-template/tests/controller/metadata_daemonset_test.yaml @@ -18,8 +18,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -44,8 +44,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -77,7 +77,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/controller/metadata_deployment_test.yaml b/charts/other/app-template/tests/controller/metadata_deployment_test.yaml similarity index 87% rename from charts/other/common-chart/tests/controller/metadata_deployment_test.yaml rename to charts/other/app-template/tests/controller/metadata_deployment_test.yaml index 3a24ed12..874c37b3 100644 --- a/charts/other/common-chart/tests/controller/metadata_deployment_test.yaml +++ b/charts/other/app-template/tests/controller/metadata_deployment_test.yaml @@ -18,8 +18,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -44,8 +44,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -77,7 +77,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/controller/metadata_statefulset_test.yaml b/charts/other/app-template/tests/controller/metadata_statefulset_test.yaml similarity index 87% rename from charts/other/common-chart/tests/controller/metadata_statefulset_test.yaml rename to charts/other/app-template/tests/controller/metadata_statefulset_test.yaml index caed2378..2b29f472 100644 --- a/charts/other/common-chart/tests/controller/metadata_statefulset_test.yaml +++ b/charts/other/app-template/tests/controller/metadata_statefulset_test.yaml @@ -18,8 +18,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -44,8 +44,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -77,7 +77,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/controller/type_test.yaml b/charts/other/app-template/tests/controller/type_test.yaml similarity index 90% rename from charts/other/common-chart/tests/controller/type_test.yaml rename to charts/other/app-template/tests/controller/type_test.yaml index 621bf558..fa812ff6 100644 --- a/charts/other/common-chart/tests/controller/type_test.yaml +++ b/charts/other/app-template/tests/controller/type_test.yaml @@ -10,7 +10,7 @@ tests: - documentIndex: *ControllerDoc equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: daemonset should pass set: @@ -22,7 +22,7 @@ tests: - documentIndex: *ControllerDoc equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: statefulset should pass set: @@ -34,7 +34,7 @@ tests: - documentIndex: *ControllerDoc equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: disabled should pass set: diff --git a/charts/other/common-chart/tests/ingress/metadata_test.yaml b/charts/other/app-template/tests/ingress/metadata_test.yaml similarity index 87% rename from charts/other/common-chart/tests/ingress/metadata_test.yaml rename to charts/other/app-template/tests/ingress/metadata_test.yaml index c37f8697..c6a81a5d 100644 --- a/charts/other/common-chart/tests/ingress/metadata_test.yaml +++ b/charts/other/app-template/tests/ingress/metadata_test.yaml @@ -18,8 +18,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -44,8 +44,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -77,7 +77,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/ingress/presence_test.yaml b/charts/other/app-template/tests/ingress/presence_test.yaml similarity index 100% rename from charts/other/common-chart/tests/ingress/presence_test.yaml rename to charts/other/app-template/tests/ingress/presence_test.yaml diff --git a/charts/other/common-chart/tests/ingress/service_reference_test.yaml b/charts/other/app-template/tests/ingress/service_reference_test.yaml similarity index 94% rename from charts/other/common-chart/tests/ingress/service_reference_test.yaml rename to charts/other/app-template/tests/ingress/service_reference_test.yaml index f46d3627..92ccfb2f 100644 --- a/charts/other/common-chart/tests/ingress/service_reference_test.yaml +++ b/charts/other/app-template/tests/ingress/service_reference_test.yaml @@ -13,7 +13,7 @@ tests: equal: path: spec.rules[0].http.paths[0].backend value: - serviceName: RELEASE-NAME-common-chart + serviceName: RELEASE-NAME-app-template servicePort: null - it: custom service reference should pass diff --git a/charts/other/common-chart/tests/ingress/tls_test.yaml b/charts/other/app-template/tests/ingress/tls_test.yaml similarity index 100% rename from charts/other/common-chart/tests/ingress/tls_test.yaml rename to charts/other/app-template/tests/ingress/tls_test.yaml diff --git a/charts/other/common-chart/tests/ingress/values_test.yaml b/charts/other/app-template/tests/ingress/values_test.yaml similarity index 100% rename from charts/other/common-chart/tests/ingress/values_test.yaml rename to charts/other/app-template/tests/ingress/values_test.yaml diff --git a/charts/other/common-chart/tests/persistence/claimnames_test.yaml b/charts/other/app-template/tests/persistence/claimnames_test.yaml similarity index 91% rename from charts/other/common-chart/tests/persistence/claimnames_test.yaml rename to charts/other/app-template/tests/persistence/claimnames_test.yaml index 33e063cf..e730ae80 100644 --- a/charts/other/common-chart/tests/persistence/claimnames_test.yaml +++ b/charts/other/app-template/tests/persistence/claimnames_test.yaml @@ -17,7 +17,7 @@ tests: value: name: config persistentVolumeClaim: - claimName: RELEASE-NAME-common-chart-config + claimName: RELEASE-NAME-app-template-config - it: with existingClaim should pass set: @@ -55,7 +55,7 @@ tests: value: name: claimWithoutSuffix persistentVolumeClaim: - claimName: RELEASE-NAME-common-chart + claimName: RELEASE-NAME-app-template - it: custom suffix should pass set: @@ -75,4 +75,4 @@ tests: value: name: claimWithNameOverride persistentVolumeClaim: - claimName: RELEASE-NAME-common-chart-suffix + claimName: RELEASE-NAME-app-template-suffix diff --git a/charts/other/common-chart/tests/persistence/emptydir_test.yaml b/charts/other/app-template/tests/persistence/emptydir_test.yaml similarity index 100% rename from charts/other/common-chart/tests/persistence/emptydir_test.yaml rename to charts/other/app-template/tests/persistence/emptydir_test.yaml diff --git a/charts/other/common-chart/tests/persistence/hostpath_test.yaml b/charts/other/app-template/tests/persistence/hostpath_test.yaml similarity index 100% rename from charts/other/common-chart/tests/persistence/hostpath_test.yaml rename to charts/other/app-template/tests/persistence/hostpath_test.yaml diff --git a/charts/other/common-chart/tests/persistence/types_test.yaml b/charts/other/app-template/tests/persistence/types_test.yaml similarity index 98% rename from charts/other/common-chart/tests/persistence/types_test.yaml rename to charts/other/app-template/tests/persistence/types_test.yaml index 84e544af..51fda878 100644 --- a/charts/other/common-chart/tests/persistence/types_test.yaml +++ b/charts/other/app-template/tests/persistence/types_test.yaml @@ -65,7 +65,7 @@ tests: value: name: configmap configMap: - name: RELEASE-NAME-common-chart-config + name: RELEASE-NAME-app-template-config - it: secret persistence type should pass set: diff --git a/charts/other/common-chart/tests/persistence/volumeclaimtemplates_test.yaml b/charts/other/app-template/tests/persistence/volumeclaimtemplates_test.yaml similarity index 100% rename from charts/other/common-chart/tests/persistence/volumeclaimtemplates_test.yaml rename to charts/other/app-template/tests/persistence/volumeclaimtemplates_test.yaml diff --git a/charts/other/common-chart/tests/pod/additionalcontainers_test.yaml b/charts/other/app-template/tests/pod/additionalcontainers_test.yaml similarity index 100% rename from charts/other/common-chart/tests/pod/additionalcontainers_test.yaml rename to charts/other/app-template/tests/pod/additionalcontainers_test.yaml diff --git a/charts/other/common-chart/tests/pod/initcontainers_test.yaml b/charts/other/app-template/tests/pod/initcontainers_test.yaml similarity index 100% rename from charts/other/common-chart/tests/pod/initcontainers_test.yaml rename to charts/other/app-template/tests/pod/initcontainers_test.yaml diff --git a/charts/other/common-chart/tests/pod/network_test.yaml b/charts/other/app-template/tests/pod/network_test.yaml similarity index 100% rename from charts/other/common-chart/tests/pod/network_test.yaml rename to charts/other/app-template/tests/pod/network_test.yaml diff --git a/charts/other/common-chart/tests/pod/replicas_test.yaml b/charts/other/app-template/tests/pod/replicas_test.yaml similarity index 100% rename from charts/other/common-chart/tests/pod/replicas_test.yaml rename to charts/other/app-template/tests/pod/replicas_test.yaml diff --git a/charts/other/common-chart/tests/pvc/metadata_test.yaml b/charts/other/app-template/tests/pvc/metadata_test.yaml similarity index 88% rename from charts/other/common-chart/tests/pvc/metadata_test.yaml rename to charts/other/app-template/tests/pvc/metadata_test.yaml index 228302f4..c2811e01 100644 --- a/charts/other/common-chart/tests/pvc/metadata_test.yaml +++ b/charts/other/app-template/tests/pvc/metadata_test.yaml @@ -18,8 +18,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: retain enabled should pass set: @@ -41,8 +41,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -67,8 +67,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -100,7 +100,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/pvc/names_test.yaml b/charts/other/app-template/tests/pvc/names_test.yaml similarity index 91% rename from charts/other/common-chart/tests/pvc/names_test.yaml rename to charts/other/app-template/tests/pvc/names_test.yaml index fd7ca8b5..fe94ba8b 100644 --- a/charts/other/common-chart/tests/pvc/names_test.yaml +++ b/charts/other/app-template/tests/pvc/names_test.yaml @@ -35,7 +35,7 @@ tests: - documentIndex: *PersistentVolumeClaimDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-config + value: RELEASE-NAME-app-template-config - it: without suffix should pass set: @@ -49,7 +49,7 @@ tests: - documentIndex: *PersistentVolumeClaimDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: with custom suffix should pass set: @@ -63,4 +63,4 @@ tests: - documentIndex: *PersistentVolumeClaimDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-custom + value: RELEASE-NAME-app-template-custom diff --git a/charts/other/common-chart/tests/pvc/storageclass_test.yaml b/charts/other/app-template/tests/pvc/storageclass_test.yaml similarity index 100% rename from charts/other/common-chart/tests/pvc/storageclass_test.yaml rename to charts/other/app-template/tests/pvc/storageclass_test.yaml diff --git a/charts/other/common-chart/tests/service/metadata_test.yaml b/charts/other/app-template/tests/service/metadata_test.yaml similarity index 87% rename from charts/other/common-chart/tests/service/metadata_test.yaml rename to charts/other/app-template/tests/service/metadata_test.yaml index 35acf1d2..e4d5d3e6 100644 --- a/charts/other/common-chart/tests/service/metadata_test.yaml +++ b/charts/other/app-template/tests/service/metadata_test.yaml @@ -16,8 +16,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 - it: custom metadata should pass set: @@ -42,8 +42,8 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart - helm.sh/chart: common-chart-0.1.0 + app.kubernetes.io/name: app-template + helm.sh/chart: app-template-0.1.0 test_label: test - it: custom metadata with global metadata should pass @@ -75,7 +75,7 @@ tests: value: app.kubernetes.io/instance: RELEASE-NAME app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: common-chart + app.kubernetes.io/name: app-template global_label: test - helm.sh/chart: common-chart-0.1.0 + helm.sh/chart: app-template-0.1.0 test_label: test diff --git a/charts/other/common-chart/tests/service/names_test.yaml b/charts/other/app-template/tests/service/names_test.yaml similarity index 86% rename from charts/other/common-chart/tests/service/names_test.yaml rename to charts/other/app-template/tests/service/names_test.yaml index a3665998..3b253e03 100644 --- a/charts/other/common-chart/tests/service/names_test.yaml +++ b/charts/other/app-template/tests/service/names_test.yaml @@ -12,7 +12,7 @@ tests: - documentIndex: *ServiceDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart + value: RELEASE-NAME-app-template - it: custom name suffix should pass set: @@ -26,4 +26,4 @@ tests: - documentIndex: *ServiceDocument equal: path: metadata.name - value: RELEASE-NAME-common-chart-http + value: RELEASE-NAME-app-template-http diff --git a/charts/other/common-chart/tests/service/port_names_test.yaml b/charts/other/app-template/tests/service/port_names_test.yaml similarity index 100% rename from charts/other/common-chart/tests/service/port_names_test.yaml rename to charts/other/app-template/tests/service/port_names_test.yaml diff --git a/charts/other/common-chart/tests/service/port_protocols_test.yaml b/charts/other/app-template/tests/service/port_protocols_test.yaml similarity index 100% rename from charts/other/common-chart/tests/service/port_protocols_test.yaml rename to charts/other/app-template/tests/service/port_protocols_test.yaml diff --git a/charts/other/common-chart/tests/service/values_test.yaml b/charts/other/app-template/tests/service/values_test.yaml similarity index 100% rename from charts/other/common-chart/tests/service/values_test.yaml rename to charts/other/app-template/tests/service/values_test.yaml diff --git a/charts/other/common-chart/values.yaml b/charts/other/app-template/values.yaml similarity index 100% rename from charts/other/common-chart/values.yaml rename to charts/other/app-template/values.yaml