v1beta2. controlplane api. wip

Signed-off-by: Alexey Makhov <amakhov@mirantis.com>
Signed-off-by: makhov <amakhov@mirantis.com>

# Conflicts:
#	internal/controller/bootstrap/controlplane_bootstrap_controller_test.go
#	internal/controller/bootstrap/worker_bootstrap_controller_test.go
#	internal/controller/controlplane/k0s_controlplane_controller_test.go

Author: makhov

api/bootstrap/v1beta1/k0s_controller_config_convert.go

@@ -7,14 +7,22 @@ import (
 )
 
 var _ conversion.Convertible = &K0sControllerConfig{}
-var _ conversion.Convertible = &K0sControllerConfigList{}
 
 // ConvertTo converts this version (v1beta1) to the hub version (v1beta2).
 func (kccv1beta1 *K0sControllerConfig) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1beta2.K0sControllerConfig)
-	dst.ObjectMeta = kccv1beta1.ObjectMeta
+	dst.ObjectMeta = *kccv1beta1.ObjectMeta.DeepCopy()
 
 	dst.Spec = k0sControllerConfigV1beta1ToV1beta2Spec(kccv1beta1.Spec)
+	dst.Status = v1beta2.K0sControllerConfigStatus{
+		Ready:          kccv1beta1.Status.Ready,
+		DataSecretName: kccv1beta1.Status.DataSecretName,
+		Conditions:     kccv1beta1.Status.Conditions,
+	}
+	if kccv1beta1.Status.DataSecretName != nil && *kccv1beta1.Status.DataSecretName != "" {
+		dst.Status.Initialization.DataSecretCreated = true
+	}
+
 	return nil
 }
 
@@ -28,6 +36,7 @@ func k0sControllerConfigV1beta1ToV1beta2Spec(spec K0sControllerConfigSpec) v1bet
 	return res
 }
 
+// ConvertK0sConfigSpecV1beta1ToV1beta2 converts K0sConfigSpec from v1beta1 to v1beta2, handling the changes in the provisioner field.
 func ConvertK0sConfigSpecV1beta1ToV1beta2(spec *K0sConfigSpec) *v1beta2.K0sConfigSpec {
 	if spec == nil {
 		return nil
@@ -67,6 +76,12 @@ func (kccv1beta1 *K0sControllerConfig) ConvertFrom(srcRaw conversion.Hub) error
 	kccv1beta1.ObjectMeta = src.ObjectMeta
 
 	kccv1beta1.Spec = k0sControllerConfigSpecV1beta2ToV1beta1(src.Spec)
+	kccv1beta1.Status = K0sControllerConfigStatus{
+		Ready:          src.Status.Ready,
+		DataSecretName: src.Status.DataSecretName,
+		Conditions:     src.Status.Conditions,
+	}
+
 	return nil
 }
 
@@ -80,6 +95,7 @@ func k0sControllerConfigSpecV1beta2ToV1beta1(spec v1beta2.K0sControllerConfigSpe
 	return res
 }
 
+// ConvertK0sConfigSpecV1beta2ToV1beta1 converts K0sConfigSpec from v1beta2 to v1beta1, handling the changes in the provisioner field.
 func ConvertK0sConfigSpecV1beta2ToV1beta1(spec *v1beta2.K0sConfigSpec) *K0sConfigSpec {
 	if spec == nil {
 		return nil
@@ -95,39 +111,13 @@ func ConvertK0sConfigSpecV1beta2ToV1beta1(spec *v1beta2.K0sConfigSpec) *K0sConfi
 		PreInstalledK0s:   spec.PreInstalledK0s,
 		DownloadURL:       spec.DownloadURL,
 		Tunneling:         spec.Tunneling,
-		CustomUserDataRef: spec.CustomUserDataRef,
 		WorkingDir:        spec.WorkingDir,
 	}
 	if spec.Provisioner.Type == provisioner.IgnitionProvisioningFormat {
 		res.Ignition = spec.Provisioner.Ignition
 	}
-	return res
-}
-
-// ConvertTo converts this version (v1beta1) to the hub version (v1beta2).
-func (kccv1beta1 *K0sControllerConfigList) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*v1beta2.K0sControllerConfigList)
-	dst.ListMeta = kccv1beta1.ListMeta
-	for _, item := range kccv1beta1.Items {
-		converted := v1beta2.K0sControllerConfig{}
-		if err := item.ConvertTo(&converted); err != nil {
-			return err
-		}
-		dst.Items = append(dst.Items, converted)
-	}
-	return nil
-}
-
-// ConvertFrom converts from the hub version (v1beta2) to this version (v1beta1).
-func (kccv1beta1 *K0sControllerConfigList) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*v1beta2.K0sControllerConfigList)
-	kccv1beta1.ListMeta = src.ListMeta
-	for _, item := range src.Items {
-		converted := K0sControllerConfig{}
-		if err := converted.ConvertFrom(&item); err != nil {
-			return err
-		}
-		kccv1beta1.Items = append(kccv1beta1.Items, converted)
+	if spec.Provisioner.CustomUserDataRef != nil {
+		res.CustomUserDataRef = spec.Provisioner.CustomUserDataRef
 	}
-	return nil
+	return res
 }

api/bootstrap/v1beta1/k0s_worker_config_convert.go

@@ -7,14 +7,21 @@ import (
 )
 
 var _ conversion.Convertible = &K0sWorkerConfig{}
-var _ conversion.Convertible = &K0sWorkerConfigList{}
 var _ conversion.Convertible = &K0sWorkerConfigTemplate{}
 
 // ConvertTo converts this version (v1beta1) to the hub version (v1beta2).
 func (kwcv1beta1 *K0sWorkerConfig) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1beta2.K0sWorkerConfig)
 	dst.ObjectMeta = kwcv1beta1.ObjectMeta
 	dst.Spec = k0sWorkerConfigV1beta1ToV1beta2Spec(kwcv1beta1.Spec)
+	dst.Status = v1beta2.K0sWorkerConfigStatus{
+		Ready:          kwcv1beta1.Status.Ready,
+		DataSecretName: kwcv1beta1.Status.DataSecretName,
+		Conditions:     kwcv1beta1.Status.Conditions,
+	}
+	if kwcv1beta1.Status.DataSecretName != nil && *kwcv1beta1.Status.DataSecretName != "" {
+		dst.Status.Initialization.DataSecretCreated = true
+	}
 	return nil
 }
 
@@ -55,6 +62,11 @@ func (kwcv1beta1 *K0sWorkerConfig) ConvertFrom(srcRaw conversion.Hub) error {
 	kwcv1beta1.ObjectMeta = src.ObjectMeta
 
 	kwcv1beta1.Spec = k0sWorkerConfigV1beta2ToV1beta1Spec(src.Spec)
+	kwcv1beta1.Status = K0sWorkerConfigStatus{
+		Ready:          src.Status.Ready,
+		DataSecretName: src.Status.DataSecretName,
+		Conditions:     src.Status.Conditions,
+	}
 	return nil
 }
 
@@ -79,34 +91,6 @@ func k0sWorkerConfigV1beta2ToV1beta1Spec(spec v1beta2.K0sWorkerConfigSpec) K0sWo
 	return res
 }
 
-// ConvertTo converts this version (v1beta1) to the hub version (v1beta2).
-func (kwcv1beta1 *K0sWorkerConfigList) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*v1beta2.K0sWorkerConfigList)
-	dst.ListMeta = kwcv1beta1.ListMeta
-	for _, item := range kwcv1beta1.Items {
-		converted := v1beta2.K0sWorkerConfig{}
-		if err := item.ConvertTo(&converted); err != nil {
-			return err
-		}
-		dst.Items = append(dst.Items, converted)
-	}
-	return nil
-}
-
-// ConvertFrom converts from the hub version (v1beta2) to this version (v1beta1).
-func (kwcv1beta1 *K0sWorkerConfigList) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*v1beta2.K0sWorkerConfigList)
-	kwcv1beta1.ListMeta = src.ListMeta
-	for _, item := range src.Items {
-		converted := K0sWorkerConfig{}
-		if err := converted.ConvertFrom(&item); err != nil {
-			return err
-		}
-		kwcv1beta1.Items = append(kwcv1beta1.Items, converted)
-	}
-	return nil
-}
-
 // ConvertTo converts this version (v1beta1) to the hub version (v1beta2).
 func (kwcv1beta1 *K0sWorkerConfigTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*v1beta2.K0sWorkerConfigTemplate)

api/bootstrap/v1beta2/k0s_types.go

@@ -184,11 +184,19 @@ type K0sWorkerConfigStatus struct {
 	// +optional
 	DataSecretName *string `json:"dataSecretName,omitempty"`
 
+	// Initialization represents the initialization status of the worker node
+	// +optional
+	Initialization StatusInitialization `json:"initialization,omitempty"`
+
 	// Conditions defines current service state of the K0sWorkerConfig.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
+type StatusInitialization struct {
+	DataSecretCreated bool `json:"dataSecretCreated,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // +kubebuilder:storageversion
 // +kubebuilder:conversion-gen=./api/bootstrap/v1beta2
@@ -212,6 +220,10 @@ type K0sControllerConfigStatus struct {
 	// +optional
 	DataSecretName *string `json:"dataSecretName,omitempty"`
 
+	// Initialization represents the initialization status of the worker node
+	// +optional
+	Initialization StatusInitialization `json:"initialization,omitempty"`
+
 	// Conditions defines current service state of the K0sControllerConfig.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
@@ -329,12 +341,6 @@ type K0sConfigSpec struct {
 	//+kubebuilder:validation:Optional
 	Tunneling TunnelingSpec `json:"tunneling,omitempty"`
 
-	// CustomUserDataRef is a reference to a secret or a configmap that contains the custom user data.
-	// Provided user-data will be merged with the one generated by k0smotron. Note that you may want to specify the merge type.
-	// See: https://cloudinit.readthedocs.io/en/latest/reference/merging.html
-	// +kubebuilder:validation:Optional
-	CustomUserDataRef *ContentSource `json:"customUserDataRef,omitempty"`
-
 	// SecretMetadata specifies metadata (labels and annotations) to be propagated to the bootstrap Secret.
 	// +kubebuilder:validation:Optional
 	SecretMetadata *SecretMetadata `json:"secretMetadata,omitempty"`

…er/bootstrap/worker_bootstrap_webhook.go …trap/v1beta2/worker_bootstrap_webhook.gointernal/controller/bootstrap/worker_bootstrap_webhook.go renamed to api/bootstrap/v1beta2/worker_bootstrap_webhook.go internal/controller/bootstrap/worker_bootstrap_webhook.go renamed to api/bootstrap/v1beta2/worker_bootstrap_webhook.go

@@ -14,14 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package bootstrap
+package v1beta2
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/k0sproject/k0smotron/api/bootstrap/v1beta2"
-	bootstrapv2 "github.com/k0sproject/k0smotron/api/bootstrap/v1beta2"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -39,7 +37,7 @@ var _ webhook.CustomValidator = &K0sWorkerConfigValidator{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
 func (v *K0sWorkerConfigValidator) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
-	c, ok := obj.(*bootstrapv2.K0sWorkerConfig)
+	c, ok := obj.(*K0sWorkerConfig)
 	if !ok {
 		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a K0sWorkerConfig but got a %T", obj))
 	}
@@ -49,7 +47,7 @@ func (v *K0sWorkerConfigValidator) ValidateCreate(_ context.Context, obj runtime
 
 // ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type.
 func (v *K0sWorkerConfigValidator) ValidateUpdate(_ context.Context, _, newObj runtime.Object) (admission.Warnings, error) {
-	newC, ok := newObj.(*bootstrapv2.K0sWorkerConfig)
+	newC, ok := newObj.(*K0sWorkerConfig)
 	if !ok {
 		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a K0sWorkerConfig but got a %T", newObj))
 	}
@@ -62,20 +60,20 @@ func (v *K0sWorkerConfigValidator) ValidateDelete(_ context.Context, _ runtime.O
 	return nil, nil
 }
 
-func (v *K0sWorkerConfigValidator) validate(c bootstrapv2.K0sWorkerConfigSpec, name string) error {
+func (v *K0sWorkerConfigValidator) validate(c K0sWorkerConfigSpec, name string) error {
 	allErrs := c.Validate(field.NewPath("spec"))
 
 	if len(allErrs) == 0 {
 		return nil
 	}
 
-	return apierrors.NewInvalid(bootstrapv2.GroupVersion.WithKind("K0sWorkerConfig").GroupKind(), name, allErrs)
+	return apierrors.NewInvalid(GroupVersion.WithKind("K0sWorkerConfig").GroupKind(), name, allErrs)
 }
 
 // SetupK0sWorkerConfigWebhookWithManager registers the webhook for K0sWorkerConfig in the manager.
 func (v *K0sWorkerConfigValidator) SetupK0sWorkerConfigWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
-		For(&v1beta2.K0sWorkerConfig{}).
+		For(&K0sWorkerConfig{}).
 		WithValidator(v).
 		Complete()
 }