Fix status update, updated k3s default version, updated CRDs (#218)

* fix status update

* fix schema and default image

* removed retry in controller

* removed fmt

Author: enrichman

charts/k3k/crds/k3k.io_clusters.yaml

@@ -164,7 +164,7 @@ spec:
                     type: string
                   type:
                     default: ephemeral
-                    description: Type can be ephermal, static, dynamic
+                    description: Type can be ephemeral, static, dynamic
                     type: string
                 required:
                 - type
@@ -238,7 +238,7 @@ spec:
                     type: string
                   type:
                     default: ephemeral
-                    description: Type can be ephermal, static, dynamic
+                    description: Type can be ephemeral, static, dynamic
                     type: string
                 required:
                 - type

cli/cmds/cluster/create.go

@@ -107,7 +107,6 @@ var (
 			Name:        "version",
 			Usage:       "k3s version",
 			Destination: &version,
-			Value:       "v1.26.1-k3s1",
 		},
 		&cli.StringFlag{
 			Name:        "mode",

main.go

@@ -50,7 +50,7 @@ var (
 			Name:        "shared-agent-image",
 			EnvVars:     []string{"SHARED_AGENT_IMAGE"},
 			Usage:       "K3K Virtual Kubelet image",
-			Value:       "rancher/k3k:k3k-kubelet-dev",
+			Value:       "rancher/k3k:latest",
 			Destination: &sharedAgentImage,
 		},
 		&cli.StringFlag{

pkg/controller/cluster/cluster.go

@@ -58,6 +58,10 @@ func Add(ctx context.Context, mgr manager.Manager, sharedAgentImage, sharedAgent
 		return err
 	}
 
+	if sharedAgentImage == "" {
+		return errors.New("missing shared agent image")
+	}
+
 	// initialize a new Reconciler
 	reconciler := ClusterReconciler{
 		DiscoveryClient:            discoveryClient,
@@ -109,7 +113,19 @@ func (c *ClusterReconciler) Reconcile(ctx context.Context, req reconcile.Request
 		}
 	}
 
-	return reconcile.Result{}, reconcilerErr
+	// if there was an error during the reconciliation, return
+	if reconcilerErr != nil {
+		return reconcile.Result{}, reconcilerErr
+	}
+
+	// update Cluster if needed
+	if !reflect.DeepEqual(orig.Spec, cluster.Spec) {
+		if err := c.Client.Update(ctx, &cluster); err != nil {
+			return reconcile.Result{}, err
+		}
+	}
+
+	return reconcile.Result{}, nil
 }
 
 func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alpha1.Cluster) error {
@@ -118,7 +134,7 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alp
 	// if the Version is not specified we will try to use the same Kubernetes version of the host.
 	// This version is stored in the Status object, and it will not be updated if already set.
 	if cluster.Spec.Version == "" && cluster.Status.HostVersion == "" {
-		log.V(1).Info("cluster version not set")
+		log.Info("cluster version not set")
 
 		hostVersion, err := c.DiscoveryClient.ServerVersion()
 		if err != nil {
@@ -130,6 +146,7 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alp
 		cluster.Status.HostVersion = k8sVersion + "-k3s1"
 	}
 
+	// TODO: update status?
 	if err := c.validate(cluster); err != nil {
 		log.Error(err, "invalid change")
 		return nil
@@ -161,6 +178,7 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alp
 	}
 
 	log.Info("creating cluster service")
+
 	serviceIP, err := c.createClusterService(ctx, cluster, s)
 	if err != nil {
 		return err
@@ -209,7 +227,7 @@ func (c *ClusterReconciler) reconcileCluster(ctx context.Context, cluster *v1alp
 		return err
 	}
 
-	return c.Client.Update(ctx, cluster)
+	return nil
 }
 
 func (c *ClusterReconciler) createClusterConfigs(ctx context.Context, cluster *v1alpha1.Cluster, server *server.Server, serviceIP string) error {

pkg/controller/cluster/cluster_suite_test.go

@@ -13,6 +13,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -59,7 +60,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	ctx, cancel = context.WithCancel(context.Background())
-	err = cluster.Add(ctx, mgr, "", "")
+	err = cluster.Add(ctx, mgr, "rancher/k3k-kubelet:latest", "")
 	Expect(err).NotTo(HaveOccurred())
 
 	go func() {
@@ -82,6 +83,8 @@ func buildScheme() *runtime.Scheme {
 
 	err := corev1.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
+	err = rbacv1.AddToScheme(scheme)
+	Expect(err).NotTo(HaveOccurred())
 	err = appsv1.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
 	err = networkingv1.AddToScheme(scheme)

pkg/controller/cluster/server/bootstrap/bootstrap.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -14,7 +15,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -36,19 +36,13 @@ type content struct {
 // 1- use the server token to get the bootstrap data from k3s
 // 2- save the bootstrap data as a secret
 func Generate(ctx context.Context, cluster *v1alpha1.Cluster, ip, token string) (*v1.Secret, error) {
-	var bootstrap *ControlRuntimeBootstrap
-	if err := retry.OnError(controller.Backoff, func(err error) bool {
-		return true
-	}, func() error {
-		var err error
-		bootstrap, err = requestBootstrap(token, ip)
-		return err
-	}); err != nil {
-		return nil, err
+	bootstrap, err := requestBootstrap(token, ip)
+	if err != nil {
+		return nil, fmt.Errorf("failed to request bootstrap secret: %w", err)
 	}
 
 	if err := decodeBootstrap(bootstrap); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to decode bootstrap secret: %w", err)
 	}
 
 	bootstrapData, err := json.Marshal(bootstrap)

tests/tests_suite_test.go

@@ -43,7 +43,7 @@ var _ = BeforeSuite(func() {
 	var err error
 	ctx := context.Background()
 
-	k3sContainer, err = k3s.Run(ctx, "rancher/k3s:v1.27.1-k3s1")
+	k3sContainer, err = k3s.Run(ctx, "rancher/k3s:v1.32.1-k3s1")
 	Expect(err).To(Not(HaveOccurred()))
 
 	kubeconfig, err := k3sContainer.GetKubeConfig(context.Background())