Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filter nodes based on pods selectors #48

Closed
wants to merge 1 commit into from
Closed

Filter nodes based on pods selectors #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions pkg/cloudprovider/kubevirt/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import (
"gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"

"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog/v2"
Expand All @@ -28,9 +30,10 @@ func init() {
}

type cloud struct {
namespace string
client client.Client
config CloudConfig
namespace string
client client.Client
managedClusterClient *kubernetes.Clientset
config CloudConfig
}

type CloudConfig struct {
Expand Down Expand Up @@ -127,17 +130,26 @@ func kubevirtCloudProviderFactory(config io.Reader) (cloudprovider.Interface, er
// Initialize provides the cloud with a kubernetes client builder and may spawn goroutines
// to perform housekeeping activities within the cloud provider.
func (c *cloud) Initialize(clientBuilder cloudprovider.ControllerClientBuilder, stop <-chan struct{}) {
clientBuilder.ConfigOrDie("")
clientSet, err := kubernetes.NewForConfig(clientBuilder.ConfigOrDie(""))
if err != nil {
klog.Fatalf("Failed to intialize cloud provider client: %v", err)
}

c.managedClusterClient = clientSet
}

// LoadBalancer returns a balancer interface. Also returns true if the interface is supported, false otherwise.
func (c *cloud) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
if !c.config.LoadBalancer.Enabled {
return nil, false
}

return &loadbalancer{
namespace: c.namespace,
client: c.client,
config: c.config.LoadBalancer,
namespace: c.namespace,
cloudProviderClient: c.client,
client: c.managedClusterClient,
config: c.config.LoadBalancer,
}, true
}

Expand Down
84 changes: 70 additions & 14 deletions pkg/cloudprovider/kubevirt/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog/v2"
kubevirtv1 "kubevirt.io/client-go/api/v1"
Expand All @@ -29,8 +30,11 @@ const (

type loadbalancer struct {
namespace string
client client.Client
config LoadBalancerConfig
// cloudProviderClient is the client for the underlying KubeVirt cluster where VMs are created.
cloudProviderClient client.Client
// client is the kuberentes cluster client that is constructed out of the created VMs in the KubeVirt cluster.
client *kubernetes.Clientset
config LoadBalancerConfig
}

// GetLoadBalancer returns whether the specified load balancer exists, and
Expand Down Expand Up @@ -64,6 +68,15 @@ func (lb *loadbalancer) GetLoadBalancerName(ctx context.Context, clusterName str
// Parameter 'clusterName' is the name of the cluster as presented to kube-controller-manager
func (lb *loadbalancer) EnsureLoadBalancer(ctx context.Context, clusterName string, service *corev1.Service, nodes []*corev1.Node) (*corev1.LoadBalancerStatus, error) {
lbName := lb.GetLoadBalancerName(ctx, clusterName, service)
if service.Spec.ExternalTrafficPolicy == corev1.ServiceExternalTrafficPolicyTypeLocal {
matchedNodes, err := lb.filterNodes(service, nodes)
if err != nil {
klog.Errorf("Failed to filter nodes: %v", err)
return nil, err
}

nodes = matchedNodes
}

err := lb.applyServiceLabels(ctx, lbName, service.ObjectMeta.Name, nodes)
if err != nil {
Expand All @@ -84,7 +97,7 @@ func (lb *loadbalancer) EnsureLoadBalancer(ctx context.Context, clusterName stri
if lbExists {
if !equality.Semantic.DeepEqual(service.Spec.Ports, lbService.Spec.Ports) {
lbService.Spec.Ports = lb.createLoadBalancerServicePorts(service)
if err := lb.client.Update(ctx, lbService); err != nil {
if err := lb.cloudProviderClient.Update(ctx, lbService); err != nil {
klog.Errorf("Failed to update LoadBalancer service: %v", err)
return nil, err
}
Expand Down Expand Up @@ -127,6 +140,16 @@ func (lb *loadbalancer) EnsureLoadBalancer(ctx context.Context, clusterName stri
// Parameter 'clusterName' is the name of the cluster as presented to kube-controller-manager
func (lb *loadbalancer) UpdateLoadBalancer(ctx context.Context, clusterName string, service *corev1.Service, nodes []*corev1.Node) error {
lbName := lb.GetLoadBalancerName(ctx, clusterName, service)
if service.Spec.ExternalTrafficPolicy == corev1.ServiceExternalTrafficPolicyTypeLocal {
matchedNodes, err := lb.filterNodes(service, nodes)
if err != nil {
klog.Errorf("Failed to filter nodes: %v", err)
return err
}

nodes = matchedNodes
}

err := lb.applyServiceLabels(ctx, lbName, service.ObjectMeta.Name, nodes)
if err != nil {
klog.Errorf("Failed to add nodes to LoadBalancer service: %v", err)
Expand Down Expand Up @@ -157,7 +180,7 @@ func (lb *loadbalancer) EnsureLoadBalancerDeleted(ctx context.Context, clusterNa
return err
}
if lbExists {
if err := lb.client.Delete(ctx, lbService); err != nil {
if err := lb.cloudProviderClient.Delete(ctx, lbService); err != nil {
klog.Errorf("Failed to delete LoadBalancer service: %v", err)
return err
}
Expand All @@ -174,7 +197,7 @@ func (lb *loadbalancer) EnsureLoadBalancerDeleted(ctx context.Context, clusterNa

func (lb *loadbalancer) getLoadBalancerService(ctx context.Context, lbName string) (*corev1.Service, bool, error) {
var service corev1.Service
if err := lb.client.Get(ctx, client.ObjectKey{Name: lbName, Namespace: lb.namespace}, &service); err != nil {
if err := lb.cloudProviderClient.Get(ctx, client.ObjectKey{Name: lbName, Namespace: lb.namespace}, &service); err != nil {
if errors.IsNotFound(err) {
return nil, false, nil
}
Expand Down Expand Up @@ -208,7 +231,7 @@ func (lb *loadbalancer) createLoadBalancerService(ctx context.Context, lbName st
lbService.Spec.HealthCheckNodePort = service.Spec.HealthCheckNodePort
}

if err := lb.client.Create(ctx, lbService); err != nil {
if err := lb.cloudProviderClient.Create(ctx, lbService); err != nil {
klog.Errorf("Failed to create LB %s: %v", lbName, err)
return nil, err
}
Expand All @@ -232,7 +255,7 @@ func (lb *loadbalancer) createLoadBalancerServicePorts(service *corev1.Service)
func (lb *loadbalancer) applyServiceLabels(ctx context.Context, lbName, serviceName string, nodes []*corev1.Node) error {
instanceIDs := buildInstanceIDMap(nodes)
var allVmis kubevirtv1.VirtualMachineInstanceList
if err := lb.client.List(ctx, &allVmis, client.InNamespace(lb.namespace)); err != nil {
if err := lb.cloudProviderClient.List(ctx, &allVmis, client.InNamespace(lb.namespace)); err != nil {
return fmt.Errorf("Failed to list VMIs: %v", err)
}
var vmiUIDs []string
Expand All @@ -241,7 +264,7 @@ func (lb *loadbalancer) applyServiceLabels(ctx context.Context, lbName, serviceN
for _, vmi := range allVmis.Items {
if _, ok := instanceIDs[vmi.ObjectMeta.Name]; ok {
vmi.ObjectMeta.Labels[serviceLabelKey(lbName)] = serviceName
if err := lb.client.Update(ctx, &vmi); err != nil {
if err := lb.cloudProviderClient.Update(ctx, &vmi); err != nil {
klog.Errorf("Failed to update VMI %s: %v", vmi.ObjectMeta.Name, err)
} else {
// Remember updated VMI UIDs to find the corresponding pods
Expand All @@ -256,7 +279,7 @@ func (lb *loadbalancer) applyServiceLabels(ctx context.Context, lbName, serviceN
if err != nil {
return fmt.Errorf("Failed to create Pod label selector: %v", err)
}
if err := lb.client.List(ctx, &vmiPods, client.InNamespace(lb.namespace), client.MatchingLabelsSelector{
if err := lb.cloudProviderClient.List(ctx, &vmiPods, client.InNamespace(lb.namespace), client.MatchingLabelsSelector{
Selector: labels.NewSelector().Add(*createdByVMIReq),
}); err != nil {
return fmt.Errorf("Failed to list VMI pods: %v", err)
Expand All @@ -265,7 +288,7 @@ func (lb *loadbalancer) applyServiceLabels(ctx context.Context, lbName, serviceN
// Apply labels to all found pods
for _, pod := range vmiPods.Items {
pod.ObjectMeta.Labels[serviceLabelKey(lbName)] = serviceName
if err := lb.client.Update(ctx, &pod); err != nil {
if err := lb.cloudProviderClient.Update(ctx, &pod); err != nil {
klog.Errorf("Failed to update pod %s: %v", pod.ObjectMeta.Name, err)
}
}
Expand All @@ -281,11 +304,11 @@ func (lb *loadbalancer) ensureServiceLabelsDeleted(ctx context.Context, lbName,
}),
}
var vmis kubevirtv1.VirtualMachineInstanceList
if err := lb.client.List(ctx, &vmis, listOptions); err != nil {
if err := lb.cloudProviderClient.List(ctx, &vmis, listOptions); err != nil {
return fmt.Errorf("Failed to list VMIs: %v", err)
}
var pods corev1.PodList
if err := lb.client.List(ctx, &pods, listOptions); err != nil {
if err := lb.cloudProviderClient.List(ctx, &pods, listOptions); err != nil {
return fmt.Errorf("Failed to list pods: %v", err)
}
vmiUIDs := make(map[string]struct{}, len(instanceIDs))
Expand All @@ -294,7 +317,7 @@ func (lb *loadbalancer) ensureServiceLabelsDeleted(ctx context.Context, lbName,
for _, vmi := range vmis.Items {
if _, ok := instanceIDs[vmi.ObjectMeta.Name]; !ok {
delete(vmi.ObjectMeta.Labels, serviceLabelKey(lbName))
if err := lb.client.Update(ctx, &vmi); err != nil {
if err := lb.cloudProviderClient.Update(ctx, &vmi); err != nil {
return fmt.Errorf("Failed to update VMI %s: %v", vmi.ObjectMeta.Name, err)
}
vmiUIDs[string(vmi.ObjectMeta.UID)] = struct{}{}
Expand All @@ -304,7 +327,7 @@ func (lb *loadbalancer) ensureServiceLabelsDeleted(ctx context.Context, lbName,
if podCreatedBy, ok := pod.ObjectMeta.Labels["kubevirt.io/created-by"]; ok {
if _, ok := vmiUIDs[podCreatedBy]; ok {
delete(pod.ObjectMeta.Labels, serviceLabelKey(lbName))
if err := lb.client.Update(ctx, &pod); err != nil {
if err := lb.cloudProviderClient.Update(ctx, &pod); err != nil {
return fmt.Errorf("Failed to update pod: %s: %v", pod.ObjectMeta.Name, err)
}
}
Expand All @@ -321,6 +344,39 @@ func (lb *loadbalancer) getLoadBalancerCreatePollInterval() time.Duration {
return defaultLoadBalancerCreatePollInterval
}

func (lb *loadbalancer) filterNodes(service *corev1.Service, nodes []*corev1.Node) ([]*corev1.Node, error) {
labelSelector := metav1.LabelSelector{MatchLabels: service.Spec.Selector}
listOptions := metav1.ListOptions{
LabelSelector: labels.Set(labelSelector.MatchLabels).String(),
Limit: 100,
}

podsList, err := lb.client.CoreV1().Pods(service.Namespace).List(context.TODO(), listOptions)
if err != nil {
return nil, fmt.Errorf("failed to list pods: %v", err)
}

var nodesNames = map[string]struct{}{}
for _, pod := range podsList.Items {
for key, val := range pod.Labels {
if s, ok := service.Spec.Selector[key]; ok {
if val == s {
nodesNames[pod.Spec.NodeName] = struct{}{}
}
}
}
}

var matchedNodes []*corev1.Node
for _, node := range nodes {
if _, ok := nodesNames[node.Name]; ok {
matchedNodes = append(matchedNodes, node)
}
}

return matchedNodes, nil
}

func buildInstanceIDMap(nodes []*corev1.Node) map[string]struct{} {
instanceIDs := make(map[string]struct{}, len(nodes))
for _, instanceID := range instanceIDsFromNodes(nodes) {
Expand Down
20 changes: 10 additions & 10 deletions pkg/cloudprovider/kubevirt/loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ func TestGetLoadBalancer(t *testing.T) {
c := mockclient.NewMockClient(ctrl)

lb := &loadbalancer{
namespace: "test",
client: c,
namespace: "test",
cloudProviderClient: c,
}

gomock.InOrder(
Expand Down Expand Up @@ -288,8 +288,8 @@ func TestGetLoadBalancerName(t *testing.T) {
c := mockclient.NewMockClient(ctrl)

lb := &loadbalancer{
namespace: "test",
client: c,
namespace: "test",
cloudProviderClient: c,
}

tests := []struct {
Expand Down Expand Up @@ -317,8 +317,8 @@ func TestEnsureLoadBalancer(t *testing.T) {
c := mockclient.NewMockClient(ctrl)

lb := &loadbalancer{
namespace: "test",
client: c,
namespace: "test",
cloudProviderClient: c,
config: LoadBalancerConfig{
CreationPollInterval: 1,
},
Expand Down Expand Up @@ -628,8 +628,8 @@ func TestUpdateLoadBalancer(t *testing.T) {
c := mockclient.NewMockClient(ctrl)

lb := &loadbalancer{
namespace: "test",
client: c,
namespace: "test",
cloudProviderClient: c,
}

createdByVMINodes12Req, _ := labels.NewRequirement("kubevirt.io/created-by", selection.In, []string{"3546a480-2ec3-11e9-b210-d663bd873d93", "3546a354-2ec3-11e9-b210-d663bd873d93"})
Expand Down Expand Up @@ -770,8 +770,8 @@ func TestEnsureLoadBalancerDeleted(t *testing.T) {
c := mockclient.NewMockClient(ctrl)

lb := &loadbalancer{
namespace: "test",
client: c,
namespace: "test",
cloudProviderClient: c,
}

listOptionsSvc1 := &client.ListOptions{Namespace: "test", LabelSelector: labels.SelectorFromSet(labels.Set{"cloud.kubevirt.io/af6ebf1722bb111e9b210d663bd873d9": "service1"})}
Expand Down