feat: use k0s kubeconfig (#377)

laverya · web-flow · commit 563c586e2872 · 2024-02-16T11:12:17.000-05:00
* move kubeconfig to ~/.kube/config

* line

* allow running tests without impacting real files

* use k0s /var/lib/k0s/pki/admin.conf kubeconfig

* f

* ff
diff --git a/cmd/embedded-cluster/install.go b/cmd/embedded-cluster/install.go
@@ -236,27 +236,9 @@ func waitForK0s(ctx context.Context) error {
 	return nil
 }
 
-// runK0sKubeconfig generates a new kubeconfig file with admin privileges.
-func runK0sKubeconfig(ctx context.Context) error {
-	stdout, err := runCommand(defaults.K0sBinaryPath(), "kubeconfig", "admin")
-	if err != nil {
-		return fmt.Errorf("unable to generate kubeconfig: %w", err)
-	}
-	kpath := defaults.PathToConfig("kubeconfig")
-	fp, err := os.OpenFile(kpath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
-	if err != nil {
-		return fmt.Errorf("unable to open kubeconfig: %w", err)
-	}
-	defer fp.Close()
-	if _, err := fp.WriteString(stdout); err != nil {
-		return fmt.Errorf("unable to write kubeconfig: %w", err)
-	}
-	return nil
-}
-
 // runOutro calls Outro() in all enabled addons by means of Applier.
 func runOutro(c *cli.Context) error {
-	os.Setenv("KUBECONFIG", defaults.PathToConfig("kubeconfig"))
+	os.Setenv("KUBECONFIG", defaults.PathToKubeConfig())
 	opts := []addons.Option{}
 	if c.String("license") != "" {
 		license, err := helpers.ParseLicense(c.String("license"))
@@ -352,12 +334,6 @@ var installCommand = &cli.Command{
 			metrics.ReportApplyFinished(c, err)
 			return err
 		}
-		logrus.Debugf("reading k0s kubeconfig")
-		if err := runK0sKubeconfig(c.Context); err != nil {
-			err := fmt.Errorf("unable to get kubeconfig: %w", err)
-			metrics.ReportApplyFinished(c, err)
-			return err
-		}
 		logrus.Debugf("running outro")
 		if err := runOutro(c); err != nil {
 			metrics.ReportApplyFinished(c, err)
diff --git a/cmd/embedded-cluster/shell.go b/cmd/embedded-cluster/shell.go
@@ -44,7 +44,7 @@ var shellCommand = &cli.Command{
 		return nil
 	},
 	Action: func(c *cli.Context) error {
-		cfgpath := defaults.PathToConfig("kubeconfig")
+		cfgpath := defaults.PathToKubeConfig()
 		if _, err := os.Stat(cfgpath); err != nil {
 			return fmt.Errorf("kubeconfig not found at %s", cfgpath)
 		}
@@ -79,7 +79,7 @@ var shellCommand = &cli.Command{
 			_ = term.Restore(fd, state)
 		}()
 
-		kcpath := defaults.PathToConfig("kubeconfig")
+		kcpath := defaults.PathToKubeConfig()
 		config := fmt.Sprintf("export KUBECONFIG=%q\n", kcpath)
 		_, _ = shellpty.WriteString(config)
 		_, _ = io.CopyN(io.Discard, shellpty, int64(len(config)+1))
diff --git a/e2e/scripts/check-installation-state.sh b/e2e/scripts/check-installation-state.sh
@@ -37,6 +37,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main
diff --git a/e2e/scripts/check-nodes-removed.sh b/e2e/scripts/check-nodes-removed.sh
@@ -31,6 +31,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main "$@"
diff --git a/e2e/scripts/check-postupgrade-state.sh b/e2e/scripts/check-postupgrade-state.sh
@@ -77,6 +77,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main "$@"
diff --git a/e2e/scripts/default-install.sh b/e2e/scripts/default-install.sh
@@ -84,6 +84,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main
diff --git a/e2e/scripts/embedded-preflight.sh b/e2e/scripts/embedded-preflight.sh
@@ -188,6 +188,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main
diff --git a/e2e/scripts/single-node-install.sh b/e2e/scripts/single-node-install.sh
@@ -163,6 +163,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main
diff --git a/e2e/scripts/unsupported-overrides.sh b/e2e/scripts/unsupported-overrides.sh
@@ -147,7 +147,7 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export K0SCONFIG=/etc/k0s/k0s.yaml
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main
diff --git a/e2e/scripts/wait-for-ready-nodes.sh b/e2e/scripts/wait-for-ready-nodes.sh
@@ -22,6 +22,6 @@ main() {
 }
 
 export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"
-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig
+export KUBECONFIG=/var/lib/k0s/pki/admin.conf
 export PATH=$PATH:/root/.config/embedded-cluster/bin
 main "$@"
diff --git a/pkg/defaults/defaults.go b/pkg/defaults/defaults.go
@@ -67,6 +67,10 @@ func PathToConfig(name string) string {
 	return def().PathToConfig(name)
 }
 
+func PathToKubeConfig() string {
+	return def().PathToKubeConfig()
+}
+
 // PreferredNodeIPAddress calls PreferredNodeIPAddress on the default provider.
 func PreferredNodeIPAddress() (string, error) {
 	return def().PreferredNodeIPAddress()
diff --git a/pkg/defaults/provider.go b/pkg/defaults/provider.go
@@ -131,6 +131,10 @@ func (d *Provider) PathToConfig(name string) string {
 	return filepath.Join(d.EmbeddedClusterConfigSubDir(), name)
 }
 
+func (d *Provider) PathToKubeConfig() string {
+	return "/var/lib/k0s/pki/admin.conf"
+}
+
 // PreferredNodeIPAddress returns the ip address the node uses when reaching
 // the internet. This is useful when the node has multiple interfaces and we
 // want to bind to one of the interfaces.

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ main() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`40`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`40`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`41`	`41`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`42`	`42`	`main`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ main() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`34`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`34`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`35`	`35`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`36`	`36`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,6 @@ main() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`80`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`80`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`81`	`81`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`82`	`82`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,6 @@ main() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`87`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`87`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`88`	`88`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`89`	`89`	`main`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,6 @@ main() {`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`191`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`191`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`192`	`192`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`193`	`193`	`main`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,6 @@ main() {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`166`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`166`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`167`	`167`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`168`	`168`	`main`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ main() {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`150`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`150`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`151`	`151`	`export K0SCONFIG=/etc/k0s/k0s.yaml`
`152`	`152`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`153`	`153`	`main`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ main() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`export EMBEDDED_CLUSTER_METRICS_BASEURL="https://staging.replicated.app"`
`25`		`-export KUBECONFIG=/root/.config/embedded-cluster/etc/kubeconfig`
	`25`	`+export KUBECONFIG=/var/lib/k0s/pki/admin.conf`
`26`	`26`	`export PATH=$PATH:/root/.config/embedded-cluster/bin`
`27`	`27`	`main "$@"`