Add new upgrade command

cmd/hypper/dependency_build.go

@@ -0,0 +1,30 @@
+/*
+Copyright The Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package main
+
+import (
+	"k8s.io/client-go/util/homedir"
+	"os"
+	"path/filepath"
+)
+
+// defaultKeyring returns the expanded path to the default keyring.
+func defaultKeyring() string {
+	if v, ok := os.LookupEnv("GNUPGHOME"); ok {
+		return filepath.Join(v, "pubring.gpg")
+	}
+	return filepath.Join(homedir.HomeDir(), ".gnupg", "pubring.gpg")
+}

cmd/hypper/flags.go

@@ -18,6 +18,10 @@ package main
 
 import (
 	"fmt"
+	"github.com/spf13/pflag"
+	"helm.sh/helm/v3/pkg/action"
+	"helm.sh/helm/v3/pkg/cli/values"
+	"helm.sh/helm/v3/pkg/postrender"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -28,6 +32,7 @@ import (
 )
 
 const outputFlag = "output"
+const postRenderFlag = "post-renderer"
 
 // bindOutputFlag will add the output flag to the given command and bind the
 // value to the given format pointer
@@ -76,3 +81,51 @@ func (o *outputValue) Set(s string) error {
 	*o = outputValue(outfmt)
 	return nil
 }
+
+func addChartPathOptionsFlags(f *pflag.FlagSet, c *action.ChartPathOptions) {
+	f.StringVar(&c.Version, "version", "", "specify the exact chart version to use. If this is not specified, the latest version is used")
+	f.BoolVar(&c.Verify, "verify", false, "verify the package before using it")
+	f.StringVar(&c.Keyring, "keyring", defaultKeyring(), "location of public keys used for verification")
+	f.StringVar(&c.RepoURL, "repo", "", "chart repository url where to locate the requested chart")
+	f.StringVar(&c.Username, "username", "", "chart repository username where to locate the requested chart")
+	f.StringVar(&c.Password, "password", "", "chart repository password where to locate the requested chart")
+	f.StringVar(&c.CertFile, "cert-file", "", "identify HTTPS client using this SSL certificate file")
+	f.StringVar(&c.KeyFile, "key-file", "", "identify HTTPS client using this SSL key file")
+	f.BoolVar(&c.InsecureSkipTLSverify, "insecure-skip-tls-verify", false, "skip tls certificate checks for the chart download")
+	f.StringVar(&c.CaFile, "ca-file", "", "verify certificates of HTTPS-enabled servers using this CA bundle")
+}
+
+func addValueOptionsFlags(f *pflag.FlagSet, v *values.Options) {
+	f.StringSliceVarP(&v.ValueFiles, "values", "f", []string{}, "specify values in a YAML file or a URL (can specify multiple)")
+	f.StringArrayVar(&v.Values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&v.StringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&v.FileValues, "set-file", []string{}, "set values from respective files specified via the command line (can specify multiple or separate values with commas: key1=path1,key2=path2)")
+}
+
+func bindPostRenderFlag(cmd *cobra.Command, varRef *postrender.PostRenderer) {
+	cmd.Flags().Var(&postRenderer{varRef}, postRenderFlag, "the path to an executable to be used for post rendering. If it exists in $PATH, the binary will be used, otherwise it will try to look for the executable at the given path")
+}
+
+type postRenderer struct {
+	renderer *postrender.PostRenderer
+}
+
+func (p postRenderer) String() string {
+	return "exec"
+}
+
+func (p postRenderer) Type() string {
+	return "postrenderer"
+}
+
+func (p postRenderer) Set(s string) error {
+	if s == "" {
+		return nil
+	}
+	pr, err := postrender.NewExec(s)
+	if err != nil {
+		return err
+	}
+	*p.renderer = pr
+	return nil
+}

cmd/hypper/root.go

@@ -33,6 +33,7 @@ func newRootCmd(actionConfig *action.Configuration, logger log.Logger, args []st
 		newListCmd(actionConfig, logger),
 		newStatusCmd(actionConfig, logger),
 		newRepoCmd(logger),
+		newUpgradeCmd(actionConfig, logger),
 	)
 
 	flags.ParseErrorsWhitelist.UnknownFlags = true

cmd/hypper/testdata/output/upgrade-with-bad-dependencies.txt

@@ -0,0 +1 @@
+Error: cannot load Chart.yaml: error converting YAML to JSON: yaml: line 6: did not find expected '-' indicator

cmd/hypper/testdata/output/upgrade-with-bad-or-missing-existing-release.txt

@@ -0,0 +1 @@
+Error: UPGRADE FAILED: "funny-bunny" has no deployed releases

cmd/hypper/testdata/output/upgrade-with-install-timeout.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 2
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-install.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 2
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-missing-dependencies.txt

@@ -0,0 +1 @@
+Error: found in Chart.yaml, but missing in charts/ directory: reqsubchart2

cmd/hypper/testdata/output/upgrade-with-pending-install.txt

@@ -0,0 +1 @@
+Error: UPGRADE FAILED: another operation (install/upgrade/rollback) is in progress

cmd/hypper/testdata/output/upgrade-with-reset-values.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 5
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-reset-values2.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 6
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-timeout.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 4
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-wait-for-jobs.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 3
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade-with-wait.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 3
+TEST SUITE: None

cmd/hypper/testdata/output/upgrade.txt

@@ -0,0 +1,7 @@
+Release "funny-bunny" has been upgraded 🥳 
+NAME: funny-bunny
+LAST DEPLOYED: Fri Sep  2 22:04:05 1977
+NAMESPACE: default
+STATUS: deployed
+REVISION: 3
+TEST SUITE: None

cmd/hypper/testdata/output/version-comp.txt

@@ -0,0 +1,2 @@
+:0
+Completion ended with directive: ShellCompDirectiveDefault

cmd/hypper/testdata/output/version-invalid-comp.txt

@@ -0,0 +1,2 @@
+:0
+Completion ended with directive: ShellCompDirectiveDefault

cmd/hypper/testdata/testcharts/chart-bad-requirements/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

cmd/hypper/testdata/testcharts/chart-bad-requirements/Chart.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: chart-missing-deps
+version: 0.1.0
+dependencies:
+  - name: reqsubchart
+  version: 0.1.0
+  repository: "https://example.com/charts"

cmd/hypper/testdata/testcharts/chart-bad-requirements/charts/reqsubchart/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

cmd/hypper/testdata/testcharts/chart-bad-requirements/charts/reqsubchart/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: reqsubchart
+version: 0.1.0

cmd/hypper/testdata/testcharts/chart-bad-requirements/charts/reqsubchart/values.yaml

@@ -0,0 +1,4 @@
+# Default values for reqsubchart.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value

cmd/hypper/testdata/testcharts/chart-bad-requirements/values.yaml

@@ -0,0 +1,4 @@
+# Default values for reqtest.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value

cmd/hypper/testdata/testcharts/chart-missing-deps/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

cmd/hypper/testdata/testcharts/chart-missing-deps/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: chart-missing-deps
+version: 0.1.0
+dependencies:
+  - name: reqsubchart
+    version: 0.1.0
+    repository: "https://example.com/charts"
+  - name: reqsubchart2
+    version: 0.2.0
+    repository: "https://example.com/charts"

cmd/hypper/testdata/testcharts/chart-missing-deps/charts/reqsubchart/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

cmd/hypper/testdata/testcharts/chart-missing-deps/charts/reqsubchart/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: reqsubchart
+version: 0.1.0

cmd/hypper/testdata/testcharts/chart-missing-deps/charts/reqsubchart/values.yaml

@@ -0,0 +1,4 @@
+# Default values for reqsubchart.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value

cmd/hypper/testdata/testcharts/chart-missing-deps/values.yaml

@@ -0,0 +1,4 @@
+# Default values for reqtest.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value

cmd/hypper/testdata/testcharts/chart-with-subchart-notes/Chart.yaml

@@ -0,0 +1,7 @@
+apiVersion: v2
+description: Chart with subchart notes
+name: wacky-bunny-v1
+version: 0.0.1
+dependencies:
+  - name: subchart-with-notes
+    version: 0.0.1

cmd/hypper/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v2
+description: Subchart with notes
+name: subchart-with-notes
+version: 0.0.1

cmd/hypper/testdata/testcharts/chart-with-subchart-notes/charts/subchart-with-notes/templates/NOTES.txt

@@ -0,0 +1 @@
+SUBCHART NOTES

cmd/hypper/testdata/testcharts/chart-with-subchart-notes/templates/NOTES.txt

@@ -0,0 +1 @@
+PARENT NOTES

cmd/hypper/testdata/testcharts/chart-with-subchart-update/Chart.yaml

@@ -0,0 +1,8 @@
+apiVersion: v2
+description: Chart with subchart that needs to be fetched
+name: chart-with-subchart-update
+version: 0.0.1
+dependencies:
+  - name: subchart-with-notes
+    version: 0.0.1
+    repository: file://../chart-with-subchart-notes/charts

cmd/hypper/testdata/testcharts/chart-with-subchart-update/charts/subchart-with-notes/Chart.yaml

@@ -0,0 +1,4 @@
+apiVersion: v2
+description: Subchart with notes
+name: subchart-with-notes
+version: 0.0.1

cmd/hypper/testdata/testcharts/chart-with-subchart-update/charts/subchart-with-notes/templates/NOTES.txt

@@ -0,0 +1 @@
+SUBCHART NOTES

cmd/hypper/testdata/testcharts/chart-with-subchart-update/templates/NOTES.txt

@@ -0,0 +1 @@
+PARENT NOTES

cmd/hypper/testdata/testcharts/upgradetest/templates/configmap.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ .Release.Name }}-configmap"
+data:
+  myvalue: "Hello World"
+  drink: {{ .Values.favoriteDrink }}

cmd/hypper/testdata/testcharts/upgradetest/values.yaml

@@ -0,0 +1 @@
+favoriteDrink: beer