-
-
Notifications
You must be signed in to change notification settings - Fork 463
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[BREAKING] Config File Enhancements: v1alpha3, migrations, generic k3…
…s-args (#605) Excerpt: - new version v1alpha3 with k3s extraArgs using node filters - reflected in CLI via --k3s-arg - new migration option to migrate (internally and via cli) from v1alpha2 to v1alpha3 - enhancements to how config files are being read - e2e tests for config file migration
- Loading branch information
1 parent
296f24c
commit 261ac0f
Showing
40 changed files
with
1,126 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| Copyright © 2020 The k3d Author(s) | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| */ | ||
| package config | ||
|
|
||
| import ( | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/rancher/k3d/v4/pkg/config" | ||
| log "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| "gopkg.in/yaml.v2" | ||
| ) | ||
|
|
||
| // NewCmdConfigMigrate returns a new cobra command | ||
| func NewCmdConfigMigrate() *cobra.Command { | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "migrate INPUT OUTPUT", | ||
| Args: cobra.RangeArgs(1, 2), | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
|
|
||
| configFile := args[0] | ||
|
|
||
| if _, err := os.Stat(configFile); err != nil { | ||
| log.Fatalf("Failed to stat config file %s: %+v", configFile, err) | ||
| } | ||
|
|
||
| cfgViper := viper.New() | ||
| cfgViper.SetConfigType("yaml") | ||
|
|
||
| cfgViper.SetConfigFile(configFile) | ||
|
|
||
| // try to read config into memory (viper map structure) | ||
| if err := cfgViper.ReadInConfig(); err != nil { | ||
| if _, ok := err.(viper.ConfigFileNotFoundError); ok { | ||
| log.Fatalf("Config file %s not found: %+v", configFile, err) | ||
| } | ||
| // config file found but some other error happened | ||
| log.Fatalf("Failed to read config file %s: %+v", configFile, err) | ||
| } | ||
|
|
||
| schema, err := config.GetSchemaByVersion(cfgViper.GetString("apiVersion")) | ||
| if err != nil { | ||
| log.Fatalf("Cannot validate config file %s: %+v", configFile, err) | ||
| } | ||
|
|
||
| if err := config.ValidateSchemaFile(configFile, schema); err != nil { | ||
| log.Fatalf("Schema Validation failed for config file %s: %+v", configFile, err) | ||
| } | ||
|
|
||
| log.Infof("Using config file %s (%s#%s)", cfgViper.ConfigFileUsed(), strings.ToLower(cfgViper.GetString("apiVersion")), strings.ToLower(cfgViper.GetString("kind"))) | ||
|
|
||
| cfg, err := config.FromViper(cfgViper) | ||
| if err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
|
|
||
| if cfg.GetAPIVersion() != config.DefaultConfigApiVersion { | ||
| cfg, err = config.Migrate(cfg, config.DefaultConfigApiVersion) | ||
| if err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
| } | ||
|
|
||
| yamlout, err := yaml.Marshal(cfg) | ||
| if err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
|
|
||
| output := "-" | ||
|
|
||
| if len(args) > 1 { | ||
| output = args[1] | ||
| } | ||
|
|
||
| if output == "-" { | ||
| if _, err := os.Stdout.Write(yamlout); err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
| } else { | ||
| if err := os.WriteFile(output, yamlout, os.ModeAppend); err != nil { | ||
| log.Fatalln(err) | ||
| } | ||
| } | ||
|
|
||
| }, | ||
| } | ||
|
|
||
| return cmd | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.