Merge branch 'master' into devel_upgrade

Author: sstarcher

cmd/helm.go

@@ -163,6 +163,13 @@ func (d *diffCmd) vals() ([]byte, error) {
 		}
 	}
 
+	// User specified a value via --set-string
+	for _, value := range d.stringValues {
+		if err := strvals.ParseIntoString(value, base); err != nil {
+			return []byte{}, fmt.Errorf("failed parsing --set-string data: %s", err)
+		}
+	}
+
 	return yaml.Marshal(base)
 }
 

cmd/root.go

@@ -8,17 +8,17 @@ import (
 const rootCmdLongUsage = `
 The Helm Diff Plugin
 
-* Shows a diff explaing what a helm upgrade would change:
+* Shows a diff explaining what a helm upgrade would change:
     This fetches the currently deployed version of a release
   and compares it to a local chart plus values. This can be 
   used visualize what changes a helm upgrade will perform.
 
-* Shows a diff explaing what had changed between two revisions:
+* Shows a diff explaining what had changed between two revisions:
     This fetches previously deployed versions of a release
   and compares them. This can be used visualize what changes 
   were made during revision change.
 
-* Shows a diff explaing what a helm rollback would change:
+* Shows a diff explaining what a helm rollback would change:
     This fetches the currently deployed version of a release
   and compares it to adeployed versions of a release, that you 
   want to rollback. This can be used visualize what changes a 

cmd/upgrade.go

@@ -20,8 +20,10 @@ type diffCmd struct {
 	client           helm.Interface
 	detailedExitCode bool
 	devel            bool
+	namespace        string // namespace to assume the release to be installed into. Defaults to the current kube config namespace.
 	valueFiles       valueFiles
 	values           []string
+	stringValues     []string
 	reuseValues      bool
 	resetValues      bool
 	allowUnreleased  bool
@@ -74,12 +76,14 @@ func newChartCommand() *cobra.Command {
 	f.BoolP("suppress-secrets", "q", false, "suppress secrets in the output")
 	f.VarP(&diff.valueFiles, "values", "f", "specify values in a YAML file (can specify multiple)")
 	f.StringArrayVar(&diff.values, "set", []string{}, "set values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
+	f.StringArrayVar(&diff.stringValues, "set-string", []string{}, "set STRING values on the command line (can specify multiple or separate values with commas: key1=val1,key2=val2)")
 	f.BoolVar(&diff.reuseValues, "reuse-values", false, "reuse the last release's values and merge in any new values")
 	f.BoolVar(&diff.resetValues, "reset-values", false, "reset the values to the ones built into the chart and merge in any new values")
 	f.BoolVar(&diff.allowUnreleased, "allow-unreleased", false, "enables diffing of releases that are not yet deployed via Helm")
 	f.BoolVar(&diff.devel, "devel", false, "use development versions, too. Equivalent to version '>0.0.0-0'. If --version is set, this is ignored.")
 	f.StringArrayVar(&diff.suppressedKinds, "suppress", []string{}, "allows suppression of the values listed in the diff output")
 	f.IntVarP(&diff.outputContext, "context", "C", -1, "output NUM lines of context around changes")
+	f.StringVar(&diff.namespace, "namespace", "default", "namespace to assume the release to be installed into")
 
 	addCommonCmdOptions(f)
 
@@ -128,7 +132,7 @@ func (d *diffCmd) run() error {
 	if newInstall {
 		installResponse, err := d.client.InstallRelease(
 			chartPath,
-			"default",
+			d.namespace,
 			helm.ReleaseName(d.release),
 			helm.ValueOverrides(rawVals),
 			helm.InstallDryRun(true),

glide.lock

@@ -5,12 +5,20 @@ import:
 - package: github.com/spf13/pflag
   version: 583c0c0531f06d5278b7d917446061adc344b5cd
 - package: k8s.io/helm
-  version: v2.9.0
-#taken from k8s.io/helm hlide.yaml
+  #revert back to upstream once https://github.com/helm/helm/pull/4499 is released
+  repo: https://github.com/databus23/helm.git
+  version: v2.10.0-nok8s
+#taken from k8s.io/helm glide.yaml
 - package: k8s.io/api
   version: release-1.10
+# The two packages below were expected to have `version: release-1.10`,
+# but it ended up vendoring versions of pkgs newer than those in helm's glide.lock
+# https://github.com/helm/helm/blob/cc7cc1087f586f64d0b0d08aa516a003ced2d85b/glide.lock#L400-L458
+# See #82 for more information
 - package: k8s.io/apimachinery
-  version: release-1.10
+  version: f6313580a4d36c7c74a3d845dda6e116642c4f90
+- package: k8s.io/apiserver
+  version: f7914ed3085badf66a1b6f3a5218ada28f7bd084
 - package: google.golang.org/grpc
   version: 1.7.2
 - package: golang.org/x/net

glide.yaml

@@ -1,7 +1,7 @@
 name: "diff"
 # Version is the version of Helm plus the number of official builds for this
 # plugin
-version: "2.9.0+2"
+version: "2.10.0+1"
 usage: "Preview helm upgrade changes as a diff"
 description: "Preview helm upgrade changes as a diff"
 useTunnel: true