return to using the kubectl binary, not k0s (#382)

Author: laverya

.github/workflows/dependencies.yaml

@@ -23,6 +23,10 @@ jobs:
       run: |
         export VERSION=`curl https://api.github.com/repos/openebs/charts/releases/latest | jq -r .name | tr -d openebs-`
         sed -i "/^OPENEBS_CHART_VERSION/c\OPENEBS_CHART_VERSION = $VERSION" Makefile
+    - name: Kubectl
+      run: |
+        export VERSION=`curl -L -s https://dl.k8s.io/release/stable.txt`
+        sed -i "/^KUBECTL_VERSION/c\KUBECTL_VERSION = $VERSION" Makefile
     - name: K0s
       run: |
         # Remove the '-ec.X' suffix and only update if the prefix (upstream k0s release) has changed.

Makefile

@@ -13,6 +13,7 @@ EMBEDDED_OPERATOR_CHART_VERSION = 0.22.7
 OPENEBS_CHART_URL = https://openebs.github.io/charts
 OPENEBS_CHART_NAME = openebs/openebs
 OPENEBS_CHART_VERSION = 3.10.0
+KUBECTL_VERSION = v1.29.1
 K0S_VERSION = v1.29.1+k0s.1
 K0S_BINARY_SOURCE_OVERRIDE =
 TROUBLESHOOT_VERSION = v0.83.0
@@ -44,6 +45,12 @@ pkg/goods/bins/k0s: Makefile
 	chmod +x pkg/goods/bins/k0s
 	touch pkg/goods/bins/k0s
 
+pkg/goods/bins/kubectl: Makefile
+	mkdir -p pkg/goods/bins
+	curl -L -o pkg/goods/bins/kubectl "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/amd64/kubectl"
+	chmod +x pkg/goods/bins/kubectl
+	touch pkg/goods/bins/kubectl
+
 pkg/goods/bins/kubectl-support_bundle: Makefile
 	mkdir -p pkg/goods/bins
 	mkdir -p output/tmp/support-bundle
@@ -75,6 +82,7 @@ embedded-release: embedded-cluster-linux-amd64 output/tmp/release.tar.gz output/
 .PHONY: static
 static: pkg/goods/bins/k0s \
 	pkg/goods/bins/kubectl-preflight \
+	pkg/goods/bins/kubectl \
 	pkg/goods/bins/kubectl-support_bundle
 
 .PHONY: embedded-cluster-linux-amd64

cmd/embedded-cluster/install.go

@@ -257,15 +257,6 @@ func runOutro(c *cli.Context) error {
 	return addons.NewApplier(opts...).Outro(c.Context)
 }
 
-// linkK0s is a helper function that links the k0s binary to the embedded cluster bins dir as 'kubectl'.
-func linkK0s() error {
-	if err := os.Symlink(defaults.K0sBinaryPath(), defaults.PathToEmbeddedClusterBinary("kubectl")); err != nil {
-		return fmt.Errorf("unable to create symlink: %w", err)
-	}
-
-	return nil
-}
-
 // installCommands executes the "install" command. This will ensure that a k0s.yaml file exists
 // and then run `k0s install` to apply the cluster. Once this is finished then a "kubeconfig"
 // file is created. Resulting kubeconfig is stored in the configuration dir.
@@ -348,11 +339,6 @@ var installCommand = &cli.Command{
 			metrics.ReportApplyFinished(c, err)
 			return err
 		}
-		logrus.Debugf("linking k0s binary")
-		if err := linkK0s(); err != nil {
-			metrics.ReportApplyFinished(c, err)
-			return err
-		}
 		metrics.ReportApplyFinished(c, nil)
 		return nil
 	},

cmd/embedded-cluster/join.go

@@ -182,12 +182,6 @@ var joinCommand = &cli.Command{
 			return err
 		}
 
-		logrus.Debugf("linking k0s binary")
-		if err := linkK0s(); err != nil {
-			metrics.ReportJoinFailed(c.Context, jcmd.MetricsBaseURL, jcmd.ClusterID, err)
-			return err
-		}
-
 		metrics.ReportJoinSucceeded(c.Context, jcmd.MetricsBaseURL, jcmd.ClusterID)
 		logrus.Infof("Join finished")
 		return nil