[WIP] Global skaffold config, version 2

Author: nkubala

Gopkg.lock

@@ -16,13 +16,12 @@ limitations under the License.
 
 package config
 
-type Config = []*ContextConfig
-
-type ContextConfig struct {
-	Context string        `yaml:"context"`
-	Values  ContextValues `yaml:"values"`
+type Config struct {
+	Global         *ContextConfig
+	ContextConfigs []*ContextConfig `yaml:"kubeContexts"`
 }
 
-type ContextValues struct {
-	// config values are added here
+type ContextConfig struct {
+	Kubectx     string `yaml:"kubectx,omitempty"`
+	DefaultRepo string `yaml:"default-repo"`
 }

cmd/skaffold/app/cmd/config/config.go

@@ -21,8 +21,17 @@ import (
 )
 
 var configFile, kubectx string
+var showAll, global bool
 
 func AddConfigFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVarP(&configFile, "config", "c", "", "path to skaffold config")
 	cmd.Flags().StringVarP(&kubectx, "kubectx", "k", "", "kubectl context to set values against")
 }
+
+func AddListFlags(cmd *cobra.Command) {
+	cmd.Flags().BoolVarP(&showAll, "all", "a", false, "show values for all kubecontexts")
+}
+
+func AddSetFlags(cmd *cobra.Command) {
+	cmd.Flags().BoolVarP(&global, "global", "g", false, "set value for global config")
+}

cmd/skaffold/app/cmd/config/flags.go

@@ -35,17 +35,30 @@ func NewCmdList(out io.Writer) *cobra.Command {
 		},
 	}
 	AddConfigFlags(cmd)
+	AddListFlags(cmd)
 	return cmd
 }
 
 func runList(out io.Writer) error {
-	configs, err := getConfigsForKubectx()
-	if err != nil {
-		return err
-	}
-	configYaml, err := yaml.Marshal(&configs)
-	if err != nil {
-		return errors.Wrap(err, "marshaling config")
+	var configYaml []byte
+	if showAll {
+		cfg, err := readConfig()
+		if err != nil {
+			return err
+		}
+		configYaml, err = yaml.Marshal(&cfg)
+		if err != nil {
+			return errors.Wrap(err, "marshaling config")
+		}
+	} else {
+		configs, err := getConfigForKubectx()
+		if err != nil {
+			return err
+		}
+		configYaml, err = yaml.Marshal(&configs)
+		if err != nil {
+			return errors.Wrap(err, "marshaling config")
+		}
 	}
 
 	out.Write(configYaml)

cmd/skaffold/app/cmd/config/list.go

@@ -39,52 +39,59 @@ func NewCmdSet(out io.Writer) *cobra.Command {
 		},
 	}
 	AddConfigFlags(cmd)
+	AddSetFlags(cmd)
 	return cmd
 }
 
 func setConfigValue(name string, value interface{}) error {
-	configs, err := readConfig()
+	cfg, err := getConfigForKubectx()
 	if err != nil {
 		return err
 	}
-	var cfg *ContextConfig
-	for _, contextCfg := range *configs {
-		if kubectx == "all" || contextCfg.Context == kubectx {
-			cfg = contextCfg
-			cfgValue := reflect.ValueOf(cfg.Values)
-			var fieldName string
-			for i := 0; i < cfgValue.NumField(); i++ {
-				fieldType := reflect.TypeOf(cfg.Values).Field(i)
-				for _, tag := range strings.Split(fieldType.Tag.Get("yaml"), ",") {
-					if tag == name {
-						fieldName = fieldType.Name
-					}
-				}
-			}
-			if fieldName == "" {
-				return fmt.Errorf("%s is not a valid config field", name)
-			}
-			fieldValue := cfgValue.FieldByName(fieldName)
-
-			fieldType := fieldValue.Type()
-			val := reflect.ValueOf(value)
 
-			if fieldType != val.Type() {
-				return fmt.Errorf("%s is not a valid value for field %s", value, fieldName)
+	cfgValue := reflect.Indirect(reflect.ValueOf(cfg))
+	var fieldName string
+	for i := 0; i < cfgValue.NumField(); i++ {
+		fieldType := reflect.TypeOf(*cfg).Field(i)
+		fmt.Printf("fieldType: %+v\n", fieldType)
+		for _, tag := range strings.Split(fieldType.Tag.Get("yaml"), ",") {
+			if tag == name {
+				fieldName = fieldType.Name
 			}
-
-			reflect.ValueOf(&cfg.Values).Elem().FieldByName(fieldName).Set(val)
 		}
 	}
-	if cfg == nil {
-		return fmt.Errorf("no config entry found for kubectx %s", kubectx)
+	if fieldName == "" {
+		return fmt.Errorf("%s is not a valid config field", name)
+	}
+	fieldValue := cfgValue.FieldByName(fieldName)
+
+	fieldType := fieldValue.Type()
+	val := reflect.ValueOf(value)
+
+	if fieldType != val.Type() {
+		return fmt.Errorf("%s is not a valid value for field %s", value, fieldName)
 	}
 
-	return writeConfig(configs)
+	reflect.ValueOf(cfg).Elem().FieldByName(fieldName).Set(val)
+
+	return writeConfig(cfg)
 }
 
-func writeConfig(cfg *Config) error {
-	contents, err := yaml.Marshal(cfg)
+func writeConfig(cfg *ContextConfig) error {
+	configs, err := readConfig()
+	if err != nil {
+		return err
+	}
+	if global {
+		configs.Global = cfg
+	} else {
+		for i, contextCfg := range configs.ContextConfigs {
+			if contextCfg.Kubectx == kubectx {
+				configs.ContextConfigs[i] = cfg
+			}
+		}
+	}
+	contents, err := yaml.Marshal(configs)
 	if err != nil {
 		return errors.Wrap(err, "marshaling config")
 	}

cmd/skaffold/app/cmd/config/set.go

@@ -91,17 +91,20 @@ func readConfig() (*Config, error) {
 	return &config, nil
 }
 
-func getConfigsForKubectx() (*Config, error) {
-	configs, err := readConfig()
+// return the specific config to be modified based on the provided kubectx.
+// either returns the config corresponding to the provided or current context,
+// or the global config if that is specified (or if no current context is set).
+func getConfigForKubectx() (*ContextConfig, error) {
+	cfg, err := readConfig()
 	if err != nil {
 		return nil, err
 	}
-	if kubectx == "all" {
-		return configs, nil
+	if global {
+		return cfg.Global, nil
 	}
-	for _, cfg := range *configs {
-		if cfg.Context == kubectx {
-			return &[]*ContextConfig{cfg}, nil
+	for _, contextCfg := range cfg.ContextConfigs {
+		if contextCfg.Kubectx == kubectx {
+			return contextCfg, nil
 		}
 	}
 	return nil, fmt.Errorf("no config entry found for kubectx %s", kubectx)