Enhancement/liqo v1.0.0 (#135)

* Integration of Liqo v1.0.0-rc.3 (#131)

* Update: Liqo version 1.0.0 from Liqo version 1.0.0-rc3

* broker CRD no longer directly embeds secrets, fix liqoctl path in installation.sh, fix for Lint 1.64.2, fix liqoctl version in requirements.sh

---------

Co-authored-by: Andrea Colli-Vignarelli <[email protected]>
Co-authored-by: AlessandroCarbonelli <[email protected]>

Author: 3 people

.golangci.yml

@@ -68,7 +68,7 @@ linters-settings:
   dupl:
     threshold: 300
   gocyclo:
-    min-complexity: 34
+    min-complexity: 39
 
 linters:
   disable-all: true

apis/network/v1alpha1/broker_types.go

@@ -15,19 +15,18 @@
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // BrokerSpec defines the desired state of Broker.
 type BrokerSpec struct {
 
 	// Address of the Broker.
-	Address string         `json:"address"`
-	Name    string         `json:"name"`
-	ClCert  *corev1.Secret `json:"clcert"`
-	CaCert  *corev1.Secret `json:"cacert"`
-	Role    string         `json:"role"`
+	Address string `json:"address"`
+	Name    string `json:"name"`
+	ClCert  string `json:"clcert"`
+	CaCert  string `json:"cacert"`
+	Role    string `json:"role"`
 }
 
 // BrokerStatus defines the observed state of Broker.

apis/network/v1alpha1/zz_generated.deepcopy.go

@@ -78,10 +78,8 @@ type Configuration struct {
 
 // LiqoCredentials contains the credentials of a Liqo cluster to enstablish a peering.
 type LiqoCredentials struct {
-	ClusterID   string `json:"clusterID"`
-	ClusterName string `json:"clusterName"`
-	Token       string `json:"token"`
-	Endpoint    string `json:"endpoint"`
+	ClusterID  string `json:"liqoID"`
+	Kubeconfig string `json:"kubeconfig"`
 }
 
 // ParseConfiguration parses the configuration data into the correct type.

apis/nodecore/v1alpha1/common.go

@@ -15,6 +15,8 @@
 package v1alpha1
 
 import (
+	"context"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -28,34 +30,43 @@ var flavorlog = logf.Log.WithName("flavor-resource")
 // SetupWebhookWithManager setups the webhooks for the Flavor resource with the manager.
 func (r *Flavor) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
-		For(r).
+		For(&Flavor{}).
+		WithDefaulter(&Flavor{}).
+		WithValidator(&Flavor{}).
 		Complete()
 }
 
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/mutate-nodecore-fluidos-eu-v1alpha1-flavor,mutating=true,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=flavors,verbs=create;update,versions=v1alpha1,name=mflavor.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Defaulter = &Flavor{}
+var _ webhook.CustomDefaulter = &Flavor{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *Flavor) Default() {
+func (r *Flavor) Default(ctx context.Context, obj runtime.Object) error {
+	_ = ctx
+	// Parse obj to Flavor
+	flavor := obj.(*Flavor)
 	flavorlog.Info("DEFAULT WEBHOOK")
-	flavorlog.Info("default", "name", r.Name)
+	flavorlog.Info("default", "name", flavor.Name)
+
+	return nil
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/validate-nodecore-fluidos-eu-v1alpha1-flavor,mutating=false,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=flavors,verbs=create;update,versions=v1alpha1,name=vflavor.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Validator = &Flavor{}
+var _ webhook.CustomValidator = &Flavor{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *Flavor) ValidateCreate() (admission.Warnings, error) {
+func (r *Flavor) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	flavor := obj.(*Flavor)
 	flavorlog.Info("VALIDATE CREATE WEBHOOK")
-	flavorlog.Info("validate create", "name", r.Name)
+	flavorlog.Info("validate create", "name", flavor.Name)
 
 	// Validate creation of Flavor checking FlavorType->TypeIdenfier matches the struct inside the FlavorType->TypeData
-	typeIdenfier, _, err := ParseFlavorType(r)
+	typeIdenfier, _, err := ParseFlavorType(flavor)
 	if err != nil {
 		return nil, err
 	}
@@ -74,14 +85,16 @@ func (r *Flavor) ValidateCreate() (admission.Warnings, error) {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *Flavor) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *Flavor) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	flavor := newObj.(*Flavor)
 	flavorlog.Info("VALIDATE UPDATE WEBHOOK")
-	flavorlog.Info("validate update", "name", r.Name)
+	flavorlog.Info("validate update", "name", flavor.Name)
 
-	flavorlog.Info("old", "old", old)
+	flavorlog.Info("old", "old", oldObj)
 
 	// Validate creation of Flavor checking FlavorType->TypeIdenfier matches the struct inside the FlavorType->TypeData
-	typeIdenfier, _, err := ParseFlavorType(r)
+	typeIdenfier, _, err := ParseFlavorType(flavor)
 	if err != nil {
 		return nil, err
 	}
@@ -100,9 +113,11 @@ func (r *Flavor) ValidateUpdate(old runtime.Object) (admission.Warnings, error)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *Flavor) ValidateDelete() (admission.Warnings, error) {
+func (r *Flavor) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	flavor := obj.(*Flavor)
 	flavorlog.Info("VALIDATE DELETE WEBHOOK")
-	flavorlog.Info("validate delete", "name", r.Name)
+	flavorlog.Info("validate delete", "name", flavor.Name)
 
 	// TODO(user): fill in your validation logic upon object deletion.
 	return nil, nil

apis/nodecore/v1alpha1/flavor_webhook.go

@@ -15,6 +15,8 @@
 package v1alpha1
 
 import (
+	"context"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -28,34 +30,42 @@ var serviceblueprintlog = logf.Log.WithName("serviceblueprint-resource")
 // SetupWebhookWithManager setups the webhooks for the ServiceBlueprint resource with the manager.
 func (r *ServiceBlueprint) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
-		For(r).
+		For(&ServiceBlueprint{}).
+		WithDefaulter(&ServiceBlueprint{}).
+		WithValidator(&ServiceBlueprint{}).
 		Complete()
 }
 
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/mutate-nodecore-fluidos-eu-v1alpha1-serviceblueprint,mutating=true,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=serviceblueprints,verbs=create;update,versions=v1alpha1,name=mserviceblueprint.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Defaulter = &ServiceBlueprint{}
+var _ webhook.CustomDefaulter = &ServiceBlueprint{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *ServiceBlueprint) Default() {
+func (r *ServiceBlueprint) Default(ctx context.Context, obj runtime.Object) error {
+	_ = ctx
+	serviceblueprint := obj.(*ServiceBlueprint)
 	serviceblueprintlog.Info("DEFAULT WEBHOOK")
-	serviceblueprintlog.Info("default", "name", r.Name)
+	serviceblueprintlog.Info("default", "name", serviceblueprint.Name)
+
+	return nil
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/validate-nodecore-fluidos-eu-v1alpha1-serviceblueprint,mutating=false,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=serviceblueprints,verbs=create;update,versions=v1alpha1,name=vserviceblueprint.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Validator = &ServiceBlueprint{}
+var _ webhook.CustomValidator = &ServiceBlueprint{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *ServiceBlueprint) ValidateCreate() (admission.Warnings, error) {
+func (r *ServiceBlueprint) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	serviceblueprint := obj.(*ServiceBlueprint)
 	serviceblueprintlog.Info("VALIDATE CREATE WEBHOOK")
-	serviceblueprintlog.Info("validate create", "name", r.Name)
+	serviceblueprintlog.Info("validate create", "name", serviceblueprint.Name)
 
 	// Validate ServiceBlueprint templates
-	manifests, err := ValidateAndExtractManifests(r.Spec.Templates)
+	manifests, err := ValidateAndExtractManifests(serviceblueprint.Spec.Templates)
 	if err != nil {
 		return nil, err
 	}
@@ -67,14 +77,16 @@ func (r *ServiceBlueprint) ValidateCreate() (admission.Warnings, error) {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *ServiceBlueprint) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *ServiceBlueprint) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	serviceblueprint := newObj.(*ServiceBlueprint)
 	serviceblueprintlog.Info("VALIDATE UPDATE WEBHOOK")
-	serviceblueprintlog.Info("validate update", "name", r.Name)
+	serviceblueprintlog.Info("validate update", "name", serviceblueprint.Name)
 
-	serviceblueprintlog.Info("old", "old", old)
+	serviceblueprintlog.Info("old", "old", oldObj)
 
 	// Validate ServiceBlueprint templates
-	manifests, err := ValidateAndExtractManifests(r.Spec.Templates)
+	manifests, err := ValidateAndExtractManifests(serviceblueprint.Spec.Templates)
 	if err != nil {
 		return nil, err
 	}
@@ -86,9 +98,11 @@ func (r *ServiceBlueprint) ValidateUpdate(old runtime.Object) (admission.Warning
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *ServiceBlueprint) ValidateDelete() (admission.Warnings, error) {
+func (r *ServiceBlueprint) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	serviceblueprint := obj.(*ServiceBlueprint)
 	serviceblueprintlog.Info("VALIDATE DELETE WEBHOOK")
-	serviceblueprintlog.Info("validate delete", "name", r.Name)
+	serviceblueprintlog.Info("validate delete", "name", serviceblueprint.Name)
 
 	// TODO(user): fill in your validation logic upon object deletion.
 	return nil, nil

apis/nodecore/v1alpha1/service_blueprint_webhook.go

@@ -15,6 +15,8 @@
 package v1alpha1
 
 import (
+	"context"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -28,57 +30,69 @@ var solverlog = logf.Log.WithName("solver-resource")
 // SetupWebhookWithManager sets up and registers the webhook with the manager.
 func (r *Solver) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
-		For(r).
+		For(&Solver{}).
+		WithDefaulter(&Solver{}).
+		WithValidator(&Solver{}).
 		Complete()
 }
 
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/mutate-nodecore-fluidos-eu-v1alpha1-solver,mutating=true,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=solvers,verbs=create;update,versions=v1alpha1,name=msolver.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Defaulter = &Solver{}
+var _ webhook.CustomDefaulter = &Solver{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *Solver) Default() {
+func (r *Solver) Default(ctx context.Context, obj runtime.Object) error {
+	_ = ctx
+	solver := obj.(*Solver)
 	solverlog.Info("DEFAULT WEBHOOK")
-	solverlog.Info("default", "name", r.Name)
+	solverlog.Info("default", "name", solver.Name)
+
+	return nil
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 //nolint:lll // kubebuilder directives are too long, but they must be on the same line
 //+kubebuilder:webhook:path=/validate-nodecore-fluidos-eu-v1alpha1-solver,mutating=false,failurePolicy=fail,sideEffects=None,groups=nodecore.fluidos.eu,resources=solvers,verbs=create;update,versions=v1alpha1,name=vsolver.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Validator = &Solver{}
+var _ webhook.CustomValidator = &Solver{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *Solver) ValidateCreate() (admission.Warnings, error) {
+func (r *Solver) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	solver := obj.(*Solver)
 	solverlog.Info("VALIDATE CREATE WEBHOOK")
-	solverlog.Info("validate create", "name", r.Name)
+	solverlog.Info("validate create", "name", solver.Name)
 
-	if err := validateSelector(r.Spec.Selector); err != nil {
+	if err := validateSelector(solver.Spec.Selector); err != nil {
 		return nil, err
 	}
 
 	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *Solver) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *Solver) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	solver := newObj.(*Solver)
 	solverlog.Info("VALIDATE UPDATE WEBHOOK")
-	solverlog.Info("validate update", "name", r.Name)
+	solverlog.Info("validate update", "name", solver.Name)
 
-	solverlog.Info("old", "old", old)
+	solverlog.Info("old", "old", oldObj)
 
-	if err := validateSelector(r.Spec.Selector); err != nil {
+	if err := validateSelector(solver.Spec.Selector); err != nil {
 		return nil, err
 	}
 
 	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *Solver) ValidateDelete() (admission.Warnings, error) {
+func (r *Solver) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	_ = ctx
+	solver := obj.(*Solver)
 	solverlog.Info("VALIDATE DELETE WEBHOOK")
-	solverlog.Info("validate delete", "name", r.Name)
+	solverlog.Info("validate delete", "name", solver.Name)
 
 	// TODO(user): fill in your validation logic upon object deletion.
 	return nil, nil