Unverified Commit 8494d133 authored by Martin Hickey's avatar Martin Hickey Committed by GitHub

Merge pull request #5594 from SataQiu/fix-20190412

cleanup: using const block
parents 0664ef5c 43c43784
...@@ -24,7 +24,12 @@ import ( ...@@ -24,7 +24,12 @@ import (
"k8s.io/helm/pkg/version" "k8s.io/helm/pkg/version"
) )
const defaultImage = "gcr.io/kubernetes-helm/tiller" const (
defaultImage = "gcr.io/kubernetes-helm/tiller"
fmtJSON OutputFormat = "json"
fmtYAML OutputFormat = "yaml"
)
// Options control how to install Tiller into a cluster, upgrade, and uninstall Tiller from a cluster. // Options control how to install Tiller into a cluster, upgrade, and uninstall Tiller from a cluster.
type Options struct { type Options struct {
...@@ -154,11 +159,6 @@ func (f *OutputFormat) Type() string { ...@@ -154,11 +159,6 @@ func (f *OutputFormat) Type() string {
return "OutputFormat" return "OutputFormat"
} }
const (
fmtJSON OutputFormat = "json"
fmtYAML OutputFormat = "yaml"
)
// Set validates and sets the value of the OutputFormat // Set validates and sets the value of the OutputFormat
func (f *OutputFormat) Set(s string) error { func (f *OutputFormat) Set(s string) error {
for _, of := range []OutputFormat{fmtJSON, fmtYAML} { for _, of := range []OutputFormat{fmtJSON, fmtYAML} {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment