Assign pod's hostname if not assigned (#253)

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>

charts/k3k/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: k3k
 description: A Helm chart for K3K
 type: application
-version: 0.1.5-r1
-appVersion: v0.2.2-rc4
+version: 0.1.6-r1
+appVersion: v0.2.2-rc5

cli/cmds/cluster/create.go

@@ -55,12 +55,12 @@ func NewCreateCmd() *cli.Command {
 	createFlags := NewCreateFlags(createConfig)
 
 	return &cli.Command{
-		Name:      "create",
-		Usage:     "Create new cluster",
-		Action:    createAction(createConfig),
-		Flags:     append(cmds.CommonFlags, createFlags...),
-		Args:      false,
-		ArgsUsage: "NAME",
+		Name:            "create",
+		Usage:           "Create new cluster",
+		UsageText:       "k3kcli cluster create [command options] NAME",
+		Action:          createAction(createConfig),
+		Flags:           append(cmds.CommonFlags, createFlags...),
+		HideHelpCommand: true,
 	}
 }
 
@@ -68,10 +68,12 @@ func createAction(config *CreateConfig) cli.ActionFunc {
 	return func(clx *cli.Context) error {
 		ctx := context.Background()
 
+		if clx.NArg() != 1 {
+			return cli.ShowSubcommandHelp(clx)
+		}
+
 		name := clx.Args().First()
-		if name == "" {
-			return errors.New("empty cluster name")
-		} else if name == k3kcluster.ClusterInvalidName {
+		if name == k3kcluster.ClusterInvalidName {
 			return errors.New("invalid cluster name")
 		}
 

cli/cmds/cluster/delete.go

@@ -16,20 +16,24 @@ import (
 
 func NewDeleteCmd() *cli.Command {
 	return &cli.Command{
-		Name:   "delete",
-		Usage:  "Delete an existing cluster",
-		Action: delete,
-		Flags:  cmds.CommonFlags,
+		Name:            "delete",
+		Usage:           "Delete an existing cluster",
+		UsageText:       "k3kcli cluster delete [command options] NAME",
+		Action:          delete,
+		Flags:           cmds.CommonFlags,
+		HideHelpCommand: true,
 	}
 }
 
 func delete(clx *cli.Context) error {
 	ctx := context.Background()
 
+	if clx.NArg() != 1 {
+		return cli.ShowSubcommandHelp(clx)
+	}
+
 	name := clx.Args().First()
-	if name == "" {
-		return errors.New("empty cluster name")
-	} else if name == k3kcluster.ClusterInvalidName {
+	if name == k3kcluster.ClusterInvalidName {
 		return errors.New("invalid cluster name")
 	}
 

k3k-kubelet/provider/provider.go

@@ -347,6 +347,11 @@ func (p *Provider) createPod(ctx context.Context, pod *corev1.Pod) error {
 
 	tPod.Spec.NodeSelector = cluster.Spec.NodeSelector
 
+	// setting the hostname for the pod if its not set
+	if pod.Spec.Hostname == "" {
+		tPod.Spec.Hostname = pod.Name
+	}
+
 	// if the priorityCluss for the virtual cluster is set then override the provided value
 	// Note: the core-dns and local-path-provisioner pod are scheduled by k3s with the
 	// 'system-cluster-critical' and 'system-node-critical' default priority classes.