feat: support creating management.catte.io/v3 cluster

Signed-off-by: Carlos Salas <[email protected]>

charts/rancher-turtles/templates/rancher-turtles-components.yaml

@@ -1867,6 +1867,8 @@ rules:
   resources:
   - clusterregistrationtokens
   - clusterregistrationtokens/status
+  - clusters
+  - clusters/status
   verbs:
   - get
   - list

config/rbac/role.yaml

@@ -153,6 +153,8 @@ rules:
   resources:
   - clusterregistrationtokens
   - clusterregistrationtokens/status
+  - clusters
+  - clusters/status
   verbs:
   - get
   - list

internal/controllers/import_controller.go

@@ -231,6 +231,16 @@ func (r *CAPIImportReconciler) reconcileNormal(ctx context.Context, capiCluster
 			return ctrl.Result{}, nil
 		}
 
+		//log.Info("##### Creating management.cattle.io/v3 rancher cluster")
+		//if err := r.RancherClient.Create(ctx, &managementv3.Cluster{
+		//	ObjectMeta: metav1.ObjectMeta{
+		//		Name:      turtlesnaming.Name(capiCluster.Name).ToRancherName(),
+		//		Namespace: capiCluster.Namespace,
+		//	},
+		//}); err != nil {
+		//	return ctrl.Result{}, fmt.Errorf("error creating management.cattle.io/v3 rancher cluster: %w", err)
+		//}
+
 		if err := r.RancherClient.Create(ctx, &provisioningv1.Cluster{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      turtlesnaming.Name(capiCluster.Name).ToRancherName(),

internal/controllers/import_controller_test.go

@@ -51,6 +51,7 @@ var _ = Describe("reconcile CAPI Cluster", func() {
 		r                        *CAPIImportReconciler
 		capiCluster              *clusterv1.Cluster
 		rancherCluster           *provisioningv1.Cluster
+		rancherClusterV3         *managementv3.Cluster
 		clusterRegistrationToken *managementv3.ClusterRegistrationToken
 		capiKubeconfigSecret     *corev1.Secret
 		clusterName              = "generated-rancher-cluster"
@@ -78,6 +79,13 @@ var _ = Describe("reconcile CAPI Cluster", func() {
 			},
 		}
 
+		rancherClusterV3 = &managementv3.Cluster{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      turtlesnaming.Name(capiCluster.Name).ToRancherName(),
+				Namespace: testNamespace,
+			},
+		}
+
 		clusterRegistrationToken = &managementv3.ClusterRegistrationToken{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      clusterName,
@@ -101,6 +109,7 @@ var _ = Describe("reconcile CAPI Cluster", func() {
 		clientObjs := []client.Object{
 			capiCluster,
 			rancherCluster,
+			rancherClusterV3,
 			clusterRegistrationToken,
 			capiKubeconfigSecret,
 		}

internal/rancher/management/v3/cluster.go

@@ -0,0 +1,57 @@
+/*
+Copyright © 2023 - 2024 SUSE LLC
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v3
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// Cluster is the struct representing a Rancher Cluster.
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+type Cluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClusterSpec   `json:"spec"`
+	Status ClusterStatus `json:"status,omitempty"`
+}
+
+// ClusterSpec is the struct representing the specification of a Rancher Cluster.
+type ClusterSpec struct {
+	DisplayName string `json:"displayName,omitempty"`
+	Description string `json:"description,omitempty"`
+}
+
+// ClusterStatus is the struct representing the status of a Rancher Cluster.
+type ClusterStatus struct {
+	ClusterName   string `json:"clusterName,omitempty"`
+	AgentDeployed bool   `json:"agentDeployed,omitempty"`
+	Ready         bool   `json:"ready,omitempty"`
+}
+
+// ClusterList contains a list of ClusterList.
+// +kubebuilder:object:root=true
+type ClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Cluster `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
+}