Refactore kubeconfig handling

dschniepp · May 13, 2020 · 8f04987 · 8f04987
1 parent 10fc505
commit 8f04987
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/internal/config.go b/internal/config.go
@@ -4,13 +4,8 @@ import (
 	"time"
 
 	"gopkg.in/yaml.v3"
-
-	// Register Auth providers
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
-var kubeConfig string
-
 type Config struct {
 	SealingRuleSets []SealingRuleSet `yaml:"sealingRules"`
 }
@@ -43,9 +38,6 @@ func ExampleConfig() Config {
 	}
 }
 
-func LoadConfig(file []byte, kubeConfig string) (Config, error) {
-	kubeConfig = kubeConfig
-	var config Config
-	err := yaml.Unmarshal(file, &config)
-	return config, err
+func LoadConfig(file []byte) (config Config, err error) {
+	return config, yaml.Unmarshal(file, &config)
 }
diff --git a/internal/config_test.go b/internal/config_test.go
@@ -21,7 +21,7 @@ sealingRules:
 `)
 
 func TestLoadConfig(t *testing.T) {
-	config, _ := LoadConfig(basicConfig, "~/.kube/config")
+	config, _ := LoadConfig(basicConfig)
 
 	maxAge := config.SealingRuleSets[0].Cert.MaxAge
 	duration, _ := time.ParseDuration("720h")

diff --git a/internal/sealing_rule_set.go b/internal/sealing_rule_set.go
@@ -18,6 +18,8 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
+var kubeConfig string
+
 type certSource interface {
 	fetch() (io.ReadCloser, error)
 }

diff --git a/internal/sealit.go b/internal/sealit.go
@@ -70,14 +70,15 @@ func Template(sealedSecretPath string) (err error) {
 }
 
 func New(sealitconfig string, kubeconfig string, fetchCert bool) (*Sealit, error) {
+	kubeConfig = kubeconfig
 	log.Printf("[DEBUG] Load config file %s", sealitconfig)
 	configFile, err := ioutil.ReadFile(sealitconfig)
 
 	if err != nil {
 		return nil, err
 	}
 
-	config, err := LoadConfig(configFile, kubeconfig)
+	config, err := LoadConfig(configFile)
 
 	if err != nil {
 		return nil, err