feat(app-template): Set default nameOverride (#20)

2025-07-04 08:57:04 +02:00 · 2022-08-09 11:00:07 +02:00 · 2022-08-09 11:00:07 +02:00 · 7de4ddfe94
commit 7de4ddfe94
parent 2cf1c54473
21 changed files with 109 additions and 71 deletions
--- a/charts/other/app-template/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-app-template
+          value: RELEASE-NAME

  - it: addon enabled with deployKey should pass
    set:
@ -83,11 +83,11 @@ tests:
              items:
                - key: id_rsa
                  path: id_rsa
-              secretName: RELEASE-NAME-app-template-deploykey
+              secretName: RELEASE-NAME-deploykey
      - documentIndex: *AddonDeployKeySecretDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-deploykey
+          value: RELEASE-NAME-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-app-template-deploykey
+              secretName: RELEASE-NAME-deploykey
      - documentIndex: *AddonDeployKeySecretDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-deploykey
+          value: RELEASE-NAME-deploykey

  - it: addon enabled with existingSecret deployKey should pass
    set:
--- a/charts/other/app-template/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-app-template-vpnconfig
+              secretName: RELEASE-NAME-vpnconfig
      - documentIndex: *AddonVPNConfigSecretDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-vpnconfig
+          value: RELEASE-NAME-vpnconfig

  - it: addon enabled with existing configFile secret should pass
    set:
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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-app-template-config
+          value: RELEASE-NAME-config

  - it: with nameOverride should pass
    set:
@ -88,4 +88,4 @@ tests:
      - documentIndex: 0
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-http
+          value: RELEASE-NAME-http
--- a/charts/other/app-template/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: 4ab90b837c946c225b999f7a09f7ace4acd22f5e691b006e0d4c6b97cf34fbd0
+            checksum/config: df9353f1f56b09774c9982674bda7fde05cde68ad7bcbf9594a66f3610bce501
--- a/charts/other/app-template/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-app-template
+              name: RELEASE-NAME
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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-app-template
+          value: RELEASE-NAME

  - it: daemonset should pass
    set:
@ -22,7 +22,7 @@ tests:
      - documentIndex: *ControllerDoc
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template
+          value: RELEASE-NAME

  - it: statefulset should pass
    set:
@ -34,7 +34,7 @@ tests:
      - documentIndex: *ControllerDoc
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template
+          value: RELEASE-NAME

  - it: disabled should pass
    set:
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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-app-template
+            serviceName: RELEASE-NAME
            servicePort: null

  - it: custom service reference should pass
--- a/charts/other/app-template/tests/misc/nameoverride_test.yaml
+++ b/charts/other/app-template/tests/misc/nameoverride_test.yaml
@ -0,0 +1,25 @@
+suite: nameOverride tests
+templates:
+  - common.yaml
+tests:
+  - it: default name is set to release name
+    asserts:
+      - documentIndex: &ControllerDoc 0
+        isKind:
+          of: Deployment
+      - documentIndex: *ControllerDoc
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME
+
+  - it: global.nameOverride can be set
+    set:
+      global.nameOverride: custom-name
+    asserts:
+      - documentIndex: &ControllerDoc 0
+        isKind:
+          of: Deployment
+      - documentIndex: *ControllerDoc
+        equal:
+          path: metadata.name
+          value: RELEASE-NAME-custom-name
--- a/charts/other/app-template/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-app-template-config
+              claimName: RELEASE-NAME-config

  - it: with existingClaim should pass
    set:
@ -55,7 +55,7 @@ tests:
          value:
            name: claimWithoutSuffix
            persistentVolumeClaim:
-              claimName: RELEASE-NAME-app-template
+              claimName: RELEASE-NAME

  - it: custom suffix should pass
    set:
@ -75,4 +75,4 @@ tests:
          value:
            name: claimWithNameOverride
            persistentVolumeClaim:
-              claimName: RELEASE-NAME-app-template-suffix
+              claimName: RELEASE-NAME-suffix
--- a/charts/other/app-template/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-app-template-config
+              name: RELEASE-NAME-config

  - it: secret persistence type should pass
    set:
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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-app-template-config
+          value: RELEASE-NAME-config

  - it: without suffix should pass
    set:
@ -49,7 +49,7 @@ tests:
      - documentIndex: *PersistentVolumeClaimDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template
+          value: RELEASE-NAME

  - it: with custom suffix should pass
    set:
@ -63,4 +63,4 @@ tests:
      - documentIndex: *PersistentVolumeClaimDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-custom
+          value: RELEASE-NAME-custom
--- a/charts/other/app-template/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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1

  - 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: app-template
-            helm.sh/chart: app-template-0.1.0
+            app.kubernetes.io/name: RELEASE-NAME
+            helm.sh/chart: app-template-0.1.1
            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: app-template
+            app.kubernetes.io/name: RELEASE-NAME
            global_label: test
-            helm.sh/chart: app-template-0.1.0
+            helm.sh/chart: app-template-0.1.1
            test_label: test
--- a/charts/other/app-template/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-app-template
+          value: RELEASE-NAME

  - it: custom name suffix should pass
    set:
@ -26,4 +26,4 @@ tests:
      - documentIndex: *ServiceDocument
        equal:
          path: metadata.name
-          value: RELEASE-NAME-app-template-http
+          value: RELEASE-NAME-http