virtual node taints

Author: aleoli

apis/virtualkubelet/v1alpha1/virtualnode_types.go

@@ -66,6 +66,10 @@ type VirtualNodeSpec struct {
 	ResourceQuota corev1.ResourceQuotaSpec `json:"resourceQuota,omitempty"`
 	// Labels contains the labels to be added to the virtual node.
 	Labels map[string]string `json:"labels,omitempty"`
+	// Annotations contains the annotations to be added to the virtual node.
+	Annotations map[string]string `json:"annotations,omitempty"`
+	// Taints contains the taints to be added to the virtual node.
+	Taints []corev1.Taint `json:"taints,omitempty"`
 	// StorageClasses contains the list of the storage classes offered by the cluster.
 	StorageClasses []sharingv1alpha1.StorageType `json:"storageClasses,omitempty"`
 	// IngressClasses contains the list of the ingress classes offered by the cluster.

apis/virtualkubelet/v1alpha1/zz_generated.deepcopy.go

@@ -54,6 +54,12 @@ spec:
           spec:
             description: VirtualNodeSpec defines the desired state of VirtualNode.
             properties:
+              annotations:
+                additionalProperties:
+                  type: string
+                description: Annotations contains the annotations to be added to the
+                  virtual node.
+                type: object
               clusterIdentity:
                 description: ClusterIdentity contains the identity of the remote cluster
                   targeted by the created virtualKubelet.
@@ -503,6 +509,34 @@ spec:
                   - storageClassName
                   type: object
                 type: array
+              taints:
+                description: Taints contains the taints to be added to the virtual
+                  node.
+                items:
+                  description: The node this Taint is attached to has the "effect"
+                    on any pod that does not tolerate the Taint.
+                  properties:
+                    effect:
+                      description: Required. The effect of the taint on pods that
+                        do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule
+                        and NoExecute.
+                      type: string
+                    key:
+                      description: Required. The taint key to be applied to a node.
+                      type: string
+                    timeAdded:
+                      description: TimeAdded represents the time at which the taint
+                        was added. It is only written for NoExecute taints.
+                      format: date-time
+                      type: string
+                    value:
+                      description: The taint value corresponding to the taint key.
+                      type: string
+                  required:
+                  - effect
+                  - key
+                  type: object
+                type: array
               template:
                 description: Template contains the deployment of the created virtualKubelet.
                 properties:

deployments/liqo/crds/virtualkubelet.liqo.io_virtualnodes.yaml

@@ -16,6 +16,7 @@ package tunneloperator
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
@@ -27,7 +28,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/liqotech/liqo/apis/net/v1alpha1"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 )
 
 const (
@@ -179,8 +179,8 @@ var _ = Describe("NatmappingOperator", func() {
 					Fail(fmt.Sprintf("failed to list rules in chain %s: %s", getClusterPreRoutingMappingChain(clusterID1), err))
 				}
 				// Should contain the rule for oldIP1 but it should not contain the rule for oldIP2
-				if slice.ContainsString(rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) &&
-					!slice.ContainsString(rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) {
+				if slices.Contains(rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) &&
+					!slices.Contains(rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) {
 					return true
 				}
 				return false
@@ -222,8 +222,8 @@ var _ = Describe("NatmappingOperator", func() {
 					Fail(fmt.Sprintf("failed to list rules in chain %s: %s", getClusterPreRoutingMappingChain(clusterID1), err))
 				}
 				// Cluster1 rules should contain the rule for oldIP1 and not contain the rule for oldIP2
-				if !slice.ContainsString(cluster1Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) ||
-					slice.ContainsString(cluster1Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) {
+				if !slices.Contains(cluster1Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) ||
+					slices.Contains(cluster1Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) {
 					return false
 				}
 				return true
@@ -235,8 +235,8 @@ var _ = Describe("NatmappingOperator", func() {
 					Fail(fmt.Sprintf("failed to list rules in chain %s: %s", getClusterPreRoutingMappingChain(clusterID2), err))
 				}
 				// Cluster2 rules should contain the rule for oldIP2 and not contain the rule for oldIP1
-				if !slice.ContainsString(cluster2Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) ||
-					slice.ContainsString(cluster2Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) {
+				if !slices.Contains(cluster2Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP2, DNAT, oldIP2)) ||
+					slices.Contains(cluster2Rules, fmt.Sprintf("-d %s -j %s --to-destination %s", newIP1, DNAT, oldIP1)) {
 					return false
 				}
 				return true

internal/liqonet/tunnel-operator/natmapping_operator_test.go

@@ -17,6 +17,7 @@ package completion
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -28,7 +29,6 @@ import (
 	virtualkubeletv1alpha1 "github.com/liqotech/liqo/apis/virtualkubelet/v1alpha1"
 	identitymanager "github.com/liqotech/liqo/pkg/identityManager"
 	"github.com/liqotech/liqo/pkg/liqoctl/factory"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 	utilsvirtualnode "github.com/liqotech/liqo/pkg/utils/virtualnode"
 )
 
@@ -57,7 +57,7 @@ func common(ctx context.Context, f *factory.Factory, argsLimit int, retrieve ret
 
 		var output []string
 		for _, value := range values {
-			if strings.HasPrefix(value, toComplete) && !slice.ContainsString(args, value) {
+			if strings.HasPrefix(value, toComplete) && !slices.Contains(args, value) {
 				output = append(output, value)
 			}
 		}

pkg/liqoctl/completion/completion.go

@@ -20,6 +20,7 @@ import (
 	"math/rand"
 	"net"
 	"net/url"
+	"slices"
 	"strings"
 
 	"github.com/goombaio/namegenerator"
@@ -28,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 
 	"github.com/liqotech/liqo/pkg/consts"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 )
 
 // validate validates the correctness of the different parameters.
@@ -103,7 +103,7 @@ func (o *Options) validateAPIServer() error {
 			return err
 		}
 
-		if !slice.ContainsString(localhostValues, apiServerURL.Hostname()) {
+		if !slices.Contains(localhostValues, apiServerURL.Hostname()) {
 			o.APIServer = o.RESTConfig.Host
 		}
 
@@ -122,7 +122,7 @@ func (o *Options) validateAPIServer() error {
 		return err
 	}
 
-	if slice.ContainsString(localhostValues, apiServerURL.Hostname()) {
+	if slices.Contains(localhostValues, apiServerURL.Hostname()) {
 		return fmt.Errorf("cannot use localhost as API Server address")
 	}
 

pkg/liqoctl/install/validation.go

@@ -17,13 +17,13 @@ package statuslocal
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/pterm/pterm"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/utils/strings/slices"
 
 	"github.com/liqotech/liqo/pkg/liqoctl/output"
 	"github.com/liqotech/liqo/pkg/liqoctl/status"
@@ -120,7 +120,7 @@ func (ps *componentState) setImages(images []string) {
 // addImageVersion adds an image version to the existing ones.
 func (ps *componentState) addImageVersion(imageVersion string) {
 	iv := ps.getImages()
-	if !(slice.ContainsString(iv, imageVersion)) {
+	if !(slices.Contains(iv, imageVersion)) {
 		iv = append(iv, imageVersion)
 	}
 	ps.setImages(iv)

pkg/liqoctl/status/local/pods.go

@@ -17,6 +17,7 @@ package resources
 import (
 	"context"
 	"fmt"
+	"slices"
 	"sort"
 
 	"golang.org/x/exp/maps"
@@ -28,7 +29,6 @@ import (
 	sharingv1alpha1 "github.com/liqotech/liqo/apis/sharing/v1alpha1"
 	"github.com/liqotech/liqo/pkg/utils/getters"
 	liqolabels "github.com/liqotech/liqo/pkg/utils/labels"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 )
 
 // WellKnownResources contains the well known resources.
@@ -69,7 +69,7 @@ func Others(r corev1.ResourceList) map[string]string {
 	keys := maps.Keys(r)
 	sort.SliceStable(keys, func(i, j int) bool { return keys[i] < keys[j] })
 	for _, k := range keys {
-		if v, ok := (r)[k]; !slice.ContainsString(WellKnownResources, k.String()) && ok && v.Value() != 0 {
+		if v, ok := (r)[k]; !slices.Contains(WellKnownResources, k.String()) && ok && v.Value() != 0 {
 			result[k.String()] = v.String()
 		}
 	}

pkg/liqoctl/status/utils/resources/resources.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
+	"slices"
 	"strings"
 	"sync"
 
@@ -34,7 +35,6 @@ import (
 	liqoneterrors "github.com/liqotech/liqo/pkg/liqonet/errors"
 	"github.com/liqotech/liqo/pkg/liqonet/natmappinginflater"
 	liqonetutils "github.com/liqotech/liqo/pkg/liqonet/utils"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 )
 
 // Ipam Interface.
@@ -824,11 +824,11 @@ func (liqoIPAM *IPAM) RemoveNetworkPool(network string) error {
 	// Get cluster subnets
 	clusterSubnets := liqoIPAM.ipamStorage.getClusterSubnets()
 	// Check existence
-	if exists := slice.ContainsString(ipamPools, network); !exists {
+	if exists := slices.Contains(ipamPools, network); !exists {
 		return fmt.Errorf("network %s is not a network pool", network)
 	}
 	// Cannot remove a default one
-	if contains := slice.ContainsString(Pools, network); contains {
+	if contains := slices.Contains(Pools, network); contains {
 		return fmt.Errorf("cannot remove a default network pool")
 	}
 	// Check overlapping with cluster networks
@@ -1338,7 +1338,7 @@ func (liqoIPAM *IPAM) SetReservedSubnets(subnets []string) error {
 
 	// Free all the reserved networks not needed anymore.
 	for _, r := range reserved {
-		if !slice.ContainsString(subnets, r) {
+		if !slices.Contains(subnets, r) {
 			klog.Infof("freeing old reserved subnet %s", r)
 			if err := liqoIPAM.FreeReservedSubnet(r); err != nil {
 				return fmt.Errorf("an error occurred while freeing reserved subnet {%s}: %w", r, err)
@@ -1366,7 +1366,7 @@ func (liqoIPAM *IPAM) SetReservedSubnets(subnets []string) error {
 
 	// Reserve the newly added subnets.
 	for _, s := range subnets {
-		if slice.ContainsString(reserved, s) {
+		if slices.Contains(reserved, s) {
 			continue
 		}
 		klog.Infof("acquiring reserved subnet %s", s)

pkg/liqonet/ipam/ipam.go

@@ -238,7 +238,7 @@ func (ipamStorage *IPAMStorage) updateReservedSubnets(subnet, operation string)
 	case updateOpAdd:
 		subnets = append(subnets, subnet)
 	case updateOpRemove:
-		subnets = slice.RemoveString(subnets, subnet)
+		subnets = slice.Remove(subnets, subnet)
 	}
 	return ipamStorage.updateConfig(reservedSubnetsUpdate, subnets)
 }

pkg/liqonet/ipam/ipamStorage.go

@@ -18,6 +18,7 @@ import (
 	"encoding/csv"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 	"sync"
 
@@ -31,7 +32,6 @@ import (
 	"github.com/liqotech/liqo/pkg/liqonet/errors"
 	liqoipset "github.com/liqotech/liqo/pkg/liqonet/ipset"
 	liqonetutils "github.com/liqotech/liqo/pkg/liqonet/utils"
-	"github.com/liqotech/liqo/pkg/utils/slice"
 )
 
 const (
@@ -305,7 +305,7 @@ func (h IPTHandler) deleteLiqoChains() error {
 func (h IPTHandler) deleteChainsInTable(table string, chains, chainsToBeRemoved []string) error {
 	for _, chain := range chainsToBeRemoved {
 		// Check existence of chain
-		if slice.ContainsString(chains, chain) {
+		if slices.Contains(chains, chain) {
 			continue
 		}
 		// Chain does exist, then delete it.
@@ -474,7 +474,7 @@ func (h IPTHandler) deleteRulesInChain(chain string, rules []IPTableRule) error
 		return fmt.Errorf("unable to list rules in chain %s (table %s): %w", chain, table, err)
 	}
 	for _, rule := range rules {
-		if !slice.ContainsString(existingRules, rule.String()) {
+		if !slices.Contains(existingRules, rule.String()) {
 			continue
 		}
 		// Rule exists, then delete it
@@ -503,9 +503,9 @@ func (h IPTHandler) removeChainsPerCluster(clusterID string) error {
 	// For each cluster chain, check if it exists.
 	// If it does exist, then remove it. Otherwise do nothing.
 	for _, chain := range chains {
-		if getTableFromChain(chain) == natTable && slice.ContainsString(existingChainsNAT, chain) {
+		if getTableFromChain(chain) == natTable && slices.Contains(existingChainsNAT, chain) {
 			// Check if chain exists
-			if !slice.ContainsString(existingChainsNAT, chain) {
+			if !slices.Contains(existingChainsNAT, chain) {
 				continue
 			}
 			if err := h.Ipt.ClearAndDeleteChain(natTable, chain); err != nil {
@@ -514,8 +514,8 @@ func (h IPTHandler) removeChainsPerCluster(clusterID string) error {
 			klog.Infof("Deleted chain %s in table %s", chain, getTableFromChain(chain))
 			continue
 		}
-		if getTableFromChain(chain) == filterTable && slice.ContainsString(existingChainsFilter, chain) {
-			if !slice.ContainsString(existingChainsFilter, chain) {
+		if getTableFromChain(chain) == filterTable && slices.Contains(existingChainsFilter, chain) {
+			if !slices.Contains(existingChainsFilter, chain) {
 				continue
 			}
 			if err := h.Ipt.ClearChain(filterTable, chain); err != nil {