Merge pull request 'Remove clusterctl, kubeseal and k3d as runtime dependencies' (#255) from runtime-dependencies into main

Reviewed-on: https://gitea.obmondo.com/EnableIT/kubeaid-bootstrap-script/pulls/255

Author: Archisman-Mridha

Makefile

@@ -2,14 +2,18 @@
 SHELL = /bin/bash
 CURRENT_DIR := $(CURDIR)
 IMAGE_NAME=kubeaid-bootstrap-script-dev:latest
+NETWORK_NAME=k3d-$(MANAGEMENT_CLUSTER_NAME)
 CONTAINER_NAME=kubeaid-bootstrap-script-dev
 MANAGEMENT_CLUSTER_NAME=kubeaid-bootstrapper
-NETWORK_NAME=k3d-$(MANAGEMENT_CLUSTER_NAME)
 
 .PHONY: lint
 lint:
 	@golangci-lint run ./...
 
+.PHONY: build
+build:
+	@go build -o build/kubeaid-bootstrap-script ./cmd
+
 .PHONY: build-image-dev
 build-image-dev:
 	@docker build -f ./Dockerfile --build-arg CPU_ARCHITECTURE=arm64 -t $(IMAGE_NAME) .

cmd/cluster/cluster.go

@@ -3,6 +3,7 @@ package cluster
 import (
 	"github.com/spf13/cobra"
 
+	"github.com/Obmondo/kubeaid-bootstrap-script/cmd/cluster/delete"
 	"github.com/Obmondo/kubeaid-bootstrap-script/cmd/cluster/upgrade"
 	"github.com/Obmondo/kubeaid-bootstrap-script/pkg/config/parser"
 	"github.com/Obmondo/kubeaid-bootstrap-script/pkg/constants"
@@ -34,7 +35,7 @@ func init() {
 	ClusterCmd.AddCommand(BootstrapCmd)
 	ClusterCmd.AddCommand(TestCmd)
 	ClusterCmd.AddCommand(upgrade.UpgradeCmd)
-	ClusterCmd.AddCommand(DeleteCmd)
+	ClusterCmd.AddCommand(delete.DeleteCmd)
 	ClusterCmd.AddCommand(RecoverCmd)
 
 	// Flags.

cmd/cluster/delete/delete.go

@@ -0,0 +1,17 @@
+package delete
+
+import "github.com/spf13/cobra"
+
+var DeleteCmd = &cobra.Command{
+	Use: "delete",
+
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return cmd.Help()
+	},
+}
+
+func init() {
+	// Subcommands.
+	DeleteCmd.AddCommand(MainCmd)
+	DeleteCmd.AddCommand(ManagementCmd)
+}

cmd/cluster/delete.go cmd/cluster/delete/main.gocmd/cluster/delete.go renamed to cmd/cluster/delete/main.go

@@ -1,13 +1,13 @@
-package cluster
+package delete
 
 import (
 	"github.com/spf13/cobra"
 
 	"github.com/Obmondo/kubeaid-bootstrap-script/pkg/core"
 )
 
-var DeleteCmd = &cobra.Command{
-	Use: "delete",
+var MainCmd = &cobra.Command{
+	Use: "main",
 
 	Short: "Delete a KubeAid managed cluster",
 

cmd/cluster/delete/management.go

@@ -0,0 +1,17 @@
+package delete
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/Obmondo/kubeaid-bootstrap-script/pkg/utils/kubernetes/k3d"
+)
+
+var ManagementCmd = &cobra.Command{
+	Use: "management",
+
+	Short: "Delete the K3D based local management cluster (used to bootstrap your KubeAid managed main cluster)",
+
+	Run: func(cmd *cobra.Command, args []string) {
+		k3d.DeleteK3DCluster(cmd.Context())
+	},
+}

docs/providers/azure.md

@@ -39,12 +39,6 @@ Additionally, have the following runtime dependencies installed :
 
 - [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl)
 
-- [kubeseal](https://github.com/bitnami-labs/sealed-secrets?tab=readme-ov-file#installation)
-
-- [clusterctl](https://cluster-api.sigs.k8s.io/user/quick-start#install-clusterctl)
-
-- [k3d](https://k3d.io/stable/#installation)
-
 ## Preparing the Configuration Files
 
 You need to have 2 configuration files : `general.yaml` and `secrets.yaml` containing required credentials.
@@ -90,6 +84,6 @@ kubeaid-bootstrap-script cluster upgrade \
 
 You can delete the cluster, by running :
 ```shell script
-kubeaid-bootstrap-script cluster delete
-k3d cluster delete kubeaid-bootstrapper
+kubeaid-bootstrap-script cluster delete main
+kubeaid-bootstrap-script cluster delete management
 ```

pkg/core/upgrade_cluster.go

@@ -9,6 +9,7 @@ import (
 
 	argoCDV1Aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	yqCmdLib "github.com/mikefarah/yq/v4/cmd"
+	clusterctlClientLib "sigs.k8s.io/cluster-api/cmd/clusterctl/client"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/Obmondo/kubeaid-bootstrap-script/pkg/config"
@@ -218,10 +219,17 @@ func upgradeControlPlane(
 		)
 
 		// Rollout the control-plane, immediately
-		utils.ExecuteCommandOrDie(fmt.Sprintf(
-			"clusterctl alpha rollout restart kubeadmcontrolplane/%s -n %s",
-			kubeadmControlPlaneName, kubernetes.GetCapiClusterNamespace(),
-		))
+
+		clusterctlClient, err := clusterctlClientLib.New(ctx, "")
+		assert.AssertErrNil(ctx, err, "Failed constructing clusterctl client")
+
+		err = clusterctlClient.RolloutRestart(ctx, clusterctlClientLib.RolloutRestartOptions{
+			Namespace: kubernetes.GetCapiClusterNamespace(),
+			Resources: []string{
+				fmt.Sprintf("kubeadmcontrolplane/%s", kubeadmControlPlaneName),
+			},
+		})
+		assert.AssertErrNil(ctx, err, "Failed rolling out KubeadmControlPlane")
 	}
 }
 
@@ -282,9 +290,18 @@ func upgradeNodeGroup(ctx context.Context,
 		)
 
 		// Rollout the node-group, immediately.
-		utils.ExecuteCommandOrDie(fmt.Sprintf(
-			"clusterctl alpha rollout restart machinedeployment/%s -n %s",
-			machineDeploymentName, kubernetes.GetCapiClusterNamespace(),
-		))
+
+		clusterctlClient, err := clusterctlClientLib.New(ctx, "")
+		assert.AssertErrNil(ctx, err, "Failed constructing clusterctl client")
+
+		err = clusterctlClient.RolloutRestart(ctx, clusterctlClientLib.RolloutRestartOptions{
+			Namespace: kubernetes.GetCapiClusterNamespace(),
+			Resources: []string{
+				fmt.Sprintf("machinedeployment/%s", machineDeploymentName),
+			},
+		})
+		assert.AssertErrNil(ctx, err, "Failed rolling out MachineDeployment",
+			slog.String("name", machineDeploymentName),
+		)
 	}
 }

pkg/utils/fs.go

@@ -65,7 +65,9 @@ func CreateIntermediateDirsForFile(ctx context.Context, filePath string) {
 
 // Returns path to the directory containing cluster specific config, in the KubeAid Config dir.
 func GetClusterDir() string {
-	return path.Join(constants.KubeAidConfigDirectory, "k8s", config.ParsedGeneralConfig.Cluster.Name)
+	return path.Join(
+		constants.KubeAidConfigDirectory, "k8s", config.ParsedGeneralConfig.Cluster.Name,
+	)
 }
 
 // Returns the path to the local temp directory, where contents of the given blob storage bucket

pkg/utils/kubernetes/k3d/k3d.go

@@ -166,3 +166,15 @@ func doesK3dClusterExist(ctx context.Context, name string) bool {
 	}
 	return false
 }
+
+func DeleteK3DCluster(ctx context.Context) {
+	slog.InfoContext(ctx, "Deleting the K3D management cluster")
+
+	clusterDeleteCmd := cluster.NewCmdClusterDelete()
+	clusterDeleteCmd.SetArgs([]string{
+		"--config",
+		constants.OutputPathManagementClusterK3DConfig,
+	})
+	err := clusterDeleteCmd.ExecuteContext(ctx)
+	assert.AssertErrNil(ctx, err, "Failed deleting K3D cluster")
+}

pkg/utils/kubernetes/sealed_secrets.go

@@ -28,8 +28,9 @@ func InstallSealedSecrets(ctx context.Context) {
 		Values: &values.Options{
 			Values: []string{
 				fmt.Sprintf("sealed-secrets.namespace=%s", constants.NamespaceSealedSecrets),
-				fmt.Sprintf("sealed-secrets.fullnameOverride=%s", constants.SealedSecretsControllerName),
-
+				fmt.Sprintf(
+					"sealed-secrets.fullnameOverride=%s", constants.SealedSecretsControllerName,
+				),
 				"backup=null",
 			},
 		},