@@ -8,15 +8,15 @@ import (
88 "encoding/json"
99 "fmt"
1010
11- corev1 "k8s.io/api/core/v1"
11+ // corev1 "k8s.io/api/core/v1"
1212 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1414 "k8s.io/apimachinery/pkg/types"
1515 capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
1616 "sigs.k8s.io/controller-runtime/pkg/client"
1717
1818 intelv1alpha1 "github.com/open-edge-platform/cluster-api-provider-intel/api/v1alpha1"
19- kthreesbootstrapv1beta2 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta2"
19+ // kthreesbootstrapv1beta2 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta2"
2020 kthreescpv1beta2 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta2"
2121 apierrors "k8s.io/apimachinery/pkg/api/errors"
2222)
@@ -103,23 +103,23 @@ func (k3sintel) CreateControlPlaneTemplate(ctx context.Context, c client.Client,
103103 Namespace : name .Namespace ,
104104 }
105105
106- cpt .Spec .Template .Spec .KThreesConfigSpec = kthreesbootstrapv1beta2.KThreesConfigSpec {
107- Version : "v1.32.4+k3s1" , // TODO: make configurable from the template
108- ServerConfig : kthreesbootstrapv1beta2.KThreesServerConfig { // TODO: make configurable from the template
109- TLSSan : []string {"0.0.0.0" },
110- ClusterDomain : "cluster.edge" ,
111- DisableCloudController : func (b bool ) * bool { return & b }(false ),
112- },
113- }
114-
115- cpt .Spec .Template .Spec .MachineTemplate = kthreescpv1beta2.KThreesControlPlaneMachineTemplate {
116- InfrastructureRef : corev1.ObjectReference {
117- APIVersion : "infrastructure.cluster.x-k8s.io/v1beta1" ,
118- Kind : "IntelMachineTemplate" ,
119- Name : fmt .Sprintf ("%s-controlplane" , name .Name ),
120- Namespace : name .Namespace ,
121- },
122- }
106+ // cpt.Spec.Template.Spec.KThreesConfigSpec = kthreesbootstrapv1beta2.KThreesConfigSpec{
107+ // Version: "v1.32.4+k3s1", // TODO: make configurable from the template
108+ // ServerConfig: kthreesbootstrapv1beta2.KThreesServerConfig{ // TODO: make configurable from the template
109+ // TLSSan: []string{"0.0.0.0"},
110+ // ClusterDomain: "cluster.edge",
111+ // DisableCloudController: func(b bool) *bool { return &b }(false),
112+ // },
113+ // }
114+
115+ // cpt.Spec.Template.Spec.MachineTemplate = kthreescpv1beta2.KThreesControlPlaneMachineTemplate{
116+ // InfrastructureRef: corev1.ObjectReference{
117+ // APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
118+ // Kind: "IntelMachineTemplate",
119+ // Name: fmt.Sprintf("%s-controlplane", name.Name),
120+ // Namespace: name.Namespace,
121+ // },
122+ // }
123123
124124 if err := c .Create (ctx , & cpt ); err != nil {
125125 if apierrors .IsAlreadyExists (err ) {
0 commit comments