Simplify testdata charts

Signed-off-by: Aram Zegerius <aram@zegeri.us>
Signed-off-by: Ankita Bhopatkar <ankitabhopatkar13@gmail.com>
(cherry picked from commit 3fd4a11)

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/Chart.yaml

@@ -1,33 +1,13 @@
 apiVersion: v2
 name: umbrella
 description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.1.0
 
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-
 dependencies:
 - name: app1
   version: 0.1.0
-  repository: file://../app1
   condition: app1.enabled
 - name: app2
   version: 0.1.0
-  repository: file://../app2
   condition: app2.enabled

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/Chart.yaml

@@ -1,12 +1,11 @@
 apiVersion: v2
-appVersion: 1.16.0
-dependencies:
-- import-values:
-  - defaults
-  name: library
-  repository: file://../library
-  version: 0.1.0
-description: A Helm chart for Kubernetes
 name: app1
+description: A Helm chart for Kubernetes
 type: application
 version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
+  import-values:
+    - defaults

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/Chart.yaml

@@ -1,6 +1,5 @@
 apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
 name: library
+description: A Helm chart for Kubernetes
 type: library
 version: 0.1.0

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/templates/service.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/charts/library/values.yaml

@@ -1,83 +1,5 @@
-# Default values for library.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
 exports:
   defaults:
-    replicaCount: 1
-
-    image:
-      repository: nginx
-      pullPolicy: IfNotPresent
-      # Overrides the image tag whose default is the chart appVersion.
-      tag: ""
-
-    imagePullSecrets: []
-    nameOverride: ""
-    fullnameOverride: ""
-
-    serviceAccount:
-      # Specifies whether a service account should be created
-      create: false
-      # Annotations to add to the service account
-      annotations: {}
-      # The name of the service account to use.
-      # If not set and create is true, a name is generated using the fullname template
-      name: ""
-
-    podAnnotations: {}
-
-    podSecurityContext: {}
-      # fsGroup: 2000
-
-    securityContext: {}
-      # capabilities:
-      #   drop:
-      #   - ALL
-      # readOnlyRootFilesystem: true
-      # runAsNonRoot: true
-      # runAsUser: 1000
-
     service:
       type: ClusterIP
       port: 9090
-
-    ingress:
-      enabled: false
-      className: ""
-      annotations: {}
-        # kubernetes.io/ingress.class: nginx
-        # kubernetes.io/tls-acme: "true"
-      hosts:
-        - host: chart-example.local
-          paths:
-            - path: /
-              pathType: ImplementationSpecific
-      tls: []
-      #  - secretName: chart-example-tls
-      #    hosts:
-      #      - chart-example.local
-
-    resources: {}
-      # We usually recommend not to specify default resources and to leave this as a conscious
-      # choice for the user. This also increases chances charts run on environments with little
-      # resources, such as Minikube. If you do want to specify resources, uncomment the following
-      # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-      # limits:
-      #   cpu: 100m
-      #   memory: 128Mi
-      # requests:
-      #   cpu: 100m
-      #   memory: 128Mi
-
-    autoscaling:
-      enabled: false
-      minReplicas: 1
-      maxReplicas: 100
-      targetCPUUtilizationPercentage: 80
-      # targetMemoryUtilizationPercentage: 80
-
-    nodeSelector: {}
-
-    tolerations: []
-
-    affinity: {}

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app1/values.yaml

@@ -1,7 +1,3 @@
-# Default values for app1.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 service:
   type: ClusterIP
   port: 1234

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/Chart.yaml

@@ -1,12 +1,11 @@
 apiVersion: v2
-appVersion: 1.16.0
-dependencies:
-- import-values:
-  - defaults
-  name: library
-  repository: file://../library
-  version: 0.1.0
-description: A Helm chart for Kubernetes
 name: app2
+description: A Helm chart for Kubernetes
 type: application
 version: 0.1.0
+
+dependencies:
+- name: library
+  version: 0.1.0
+  import-values:
+    - defaults

pkg/chartutil/testdata/three-level-dependent-chart/umbrella/charts/app2/charts/library/Chart.yaml

@@ -1,6 +1,5 @@
 apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
 name: library
+description: A Helm chart for Kubernetes
 type: library
 version: 0.1.0