Merge pull request #5260 from adamreese/v3/chart-engine

ref(*): remove references to chart 'engine'
6 years ago · 612d3a9f27
parent 087d1eab52 28d8c7b277
commit 612d3a9f27
15 changed files with 46 additions and 7926 deletions
--- a/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml
+++ b/cmd/helm/testdata/helmhome/repository/cache/testing-index.yaml
@ -6,26 +6,24 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.1.0
      appVersion: 1.2.3
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
    - name: alpine
      url: https://kubernetes-charts.storage.googleapis.com/alpine-0.2.0.tgz
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.2.0
      appVersion: 2.3.4
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
  mariadb:
    - name: mariadb
@ -33,16 +31,15 @@ entries:
      checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56
      home: https://mariadb.org
      sources:
-      - https://github.com/bitnami/bitnami-docker-mariadb
+        - https://github.com/bitnami/bitnami-docker-mariadb
      version: 0.3.0
      description: Chart for MariaDB
      keywords:
-      - mariadb
-      - mysql
-      - database
-      - sql
+        - mariadb
+        - mysql
+        - database
+        - sql
      maintainers:
-      - name: Bitnami
-        email: containers@bitnami.com
-      engine: gotpl
+        - name: Bitnami
+          email: containers@bitnami.com
      icon: ""
--- a/docs/charts.md
+++ b/docs/charts.md
@ -57,7 +57,6 @@ maintainers: # (optional)
  - name: The maintainer's name (required for each maintainer)
    email: The maintainer's email (optional for each maintainer)
    url: A URL for the maintainer (optional for each maintainer)
-engine: gotpl # The name of the template engine (optional, defaults to gotpl)
 icon: A URL to an SVG or PNG image to be used as an icon (optional).
 appVersion: The version of the app that this contains (optional). This needn't be SemVer.
 deprecated: Whether this chart is deprecated (optional, boolean)
--- a/docs/using_helm.md
+++ b/docs/using_helm.md
@ -63,7 +63,7 @@ stable/mysql  	0.1.0  	Chart for MySQL
 stable/mariadb	0.5.1  	Chart for MariaDB
 ```

-Now you will only see the results that match your filter. 
+Now you will only see the results that match your filter.

 Why is
 `mariadb` in the list? Because its package description relates it to
@ -73,7 +73,6 @@ MySQL. We can use `helm inspect chart` to see this:
 $ helm inspect stable/mariadb
 Fetched stable/mariadb to mariadb-0.5.1.tgz
 description: Chart for MariaDB
-engine: gotpl
 home: https://mariadb.org
 keywords:
 - mariadb
@ -231,7 +230,7 @@ There are two ways to pass configuration data during install:

 If both are used, `--set` values are merged into `--values` with higher precedence.
 Overrides specified with `--set` are persisted in a configmap. Values that have been
-`--set` can be viewed for a given release with `helm get values <release-name>`. 
+`--set` can be viewed for a given release with `helm get values <release-name>`.
 Values that have been `--set` can be cleared by running `helm upgrade` with `--reset-values`
 specified.

@ -376,11 +375,11 @@ is not a full list of cli flags. To see a description of all flags, just run
  This defaults to 300 (5 minutes)
 - `--wait`: Waits until all Pods are in a ready state, PVCs are bound, Deployments
  have minimum (`Desired` minus `maxUnavailable`) Pods in ready state and
-  Services have an IP address (and Ingress if a `LoadBalancer`) before 
-  marking the release as successful. It will wait for as long as the 
-  `--timeout` value. If timeout is reached, the release will be marked as 
-  `FAILED`. Note: In scenario where Deployment has `replicas` set to 1 and 
-  `maxUnavailable` is not set to 0 as part of rolling update strategy, 
+  Services have an IP address (and Ingress if a `LoadBalancer`) before
+  marking the release as successful. It will wait for as long as the
+  `--timeout` value. If timeout is reached, the release will be marked as
+  `FAILED`. Note: In scenario where Deployment has `replicas` set to 1 and
+  `maxUnavailable` is not set to 0 as part of rolling update strategy,
  `--wait` will return as ready as it has satisfied the minimum Pod in ready condition.
 - `--no-hooks`: This skips running hooks for the command
 - `--recreate-pods` (only available for `upgrade` and `rollback`): This flag
--- a/pkg/chart/metadata.go
+++ b/pkg/chart/metadata.go
@ -43,8 +43,6 @@ type Metadata struct {
 	Keywords []string `json:"keywords,omitempty"`
 	// A list of name and URL/email address combinations for the maintainer(s)
 	Maintainers []*Maintainer `json:"maintainers,omitempty"`
-	// The name of the template engine to use. Defaults to 'gotpl'.
-	Engine string `json:"engine,omitempty"`
 	// The URL to an icon file.
 	Icon string `json:"icon,omitempty"`
 	// The API Version of this chart.
--- a/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
@ -7,12 +7,11 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.1.0
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
    - name: alpine
      urls:
@ -20,12 +19,11 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.2.0
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
  mariadb:
    - name: mariadb
@ -34,16 +32,15 @@ entries:
      checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56
      home: https://mariadb.org
      sources:
-      - https://github.com/bitnami/bitnami-docker-mariadb
+        - https://github.com/bitnami/bitnami-docker-mariadb
      version: 0.3.0
      description: Chart for MariaDB
      keywords:
-      - mariadb
-      - mysql
-      - database
-      - sql
+        - mariadb
+        - mysql
+        - database
+        - sql
      maintainers:
-      - name: Bitnami
-        email: containers@bitnami.com
-      engine: gotpl
+        - name: Bitnami
+          email: containers@bitnami.com
      icon: ""
--- a/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/malformed-index.yaml
@ -7,10 +7,9 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 1.2.3
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-basicauth-index.yaml
@ -3,7 +3,6 @@ entries:
  foo:
    - name: foo
      description: Foo Chart
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-https-index.yaml
@ -3,7 +3,6 @@ entries:
  foo:
    - name: foo
      description: Foo Chart
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-index.yaml
@ -7,12 +7,11 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 1.2.3
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
    - name: alpine
      urls:
@ -21,17 +20,15 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.2.0
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
  foo:
    - name: foo
      description: Foo Chart
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-querystring-index.yaml
@ -7,10 +7,9 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 1.2.3
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-index.yaml
@ -3,7 +3,6 @@ entries:
  foo:
    - name: foo
      description: Foo Chart With Relative Path
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
@ -16,7 +15,6 @@ entries:
  bar:
    - name: bar
      description: Bar Chart With Relative Path
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
--- a/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml
+++ b/pkg/downloader/testdata/helmhome/repository/cache/testing-relative-trailing-slash-index.yaml
@ -3,7 +3,6 @@ entries:
  foo:
    - name: foo
      description: Foo Chart With Relative Path
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
@ -16,7 +15,6 @@ entries:
  bar:
    - name: bar
      description: Bar Chart With Relative Path
-      engine: gotpl
      home: https://k8s.io/helm
      keywords: []
      maintainers: []
--- a/pkg/getter/testdata/repository/cache/stable-index.yaml
+++ b/pkg/getter/testdata/repository/cache/stable-index.yaml
--- a/pkg/repo/testdata/unversioned-index.yaml
+++ b/pkg/repo/testdata/unversioned-index.yaml
@ -11,9 +11,8 @@ memcached-0.1.0:
    description: A simple Memcached cluster
    keywords: []
    maintainers:
-    - name: Matt Butcher
-      email: mbutcher@deis.com
-    engine: ""
+      - name: Matt Butcher
+        email: mbutcher@deis.com
 mysql-0.2.0:
  name: mysql
  url: https://mumoshu.github.io/charts/mysql-0.2.0.tgz
@ -27,9 +26,8 @@ mysql-0.2.0:
    description: Chart running MySQL.
    keywords: []
    maintainers:
-    - name: Matt Fisher
-      email: mfisher@deis.com
-    engine: ""
+      - name: Matt Fisher
+        email: mfisher@deis.com
 mysql-0.2.1:
  name: mysql
  url: https://mumoshu.github.io/charts/mysql-0.2.1.tgz
@ -43,9 +41,8 @@ mysql-0.2.1:
    description: Chart running MySQL.
    keywords: []
    maintainers:
-    - name: Matt Fisher
-      email: mfisher@deis.com
-    engine: ""
+      - name: Matt Fisher
+        email: mfisher@deis.com
 mysql-0.2.2:
  name: mysql
  url: https://mumoshu.github.io/charts/mysql-0.2.2.tgz
@ -59,6 +56,5 @@ mysql-0.2.2:
    description: Chart running MySQL.
    keywords: []
    maintainers:
-    - name: Matt Fisher
-      email: mfisher@deis.com
-    engine: ""
+      - name: Matt Fisher
+        email: mfisher@deis.com
--- a/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
+++ b/pkg/resolver/testdata/helmhome/repository/cache/kubernetes-charts-index.yaml
@ -7,12 +7,11 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.2.0
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
    - name: alpine
      urls:
@ -20,12 +19,11 @@ entries:
      checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d
      home: https://k8s.io/helm
      sources:
-      - https://github.com/helm/helm
+        - https://github.com/helm/helm
      version: 0.1.0
      description: Deploy a basic Alpine Linux pod
      keywords: []
      maintainers: []
-      engine: ""
      icon: ""
  mariadb:
    - name: mariadb
@ -34,16 +32,15 @@ entries:
      checksum: 65229f6de44a2be9f215d11dbff311673fc8ba56
      home: https://mariadb.org
      sources:
-      - https://github.com/bitnami/bitnami-docker-mariadb
+        - https://github.com/bitnami/bitnami-docker-mariadb
      version: 0.3.0
      description: Chart for MariaDB
      keywords:
-      - mariadb
-      - mysql
-      - database
-      - sql
+        - mariadb
+        - mysql
+        - database
+        - sql
      maintainers:
-      - name: Bitnami
-        email: containers@bitnami.com
-      engine: gotpl
+        - name: Bitnami
+          email: containers@bitnami.com
      icon: ""