Skip to content

Commit

Permalink
add inspection
Browse files Browse the repository at this point in the history
  • Loading branch information
lut777 committed Oct 8, 2021
1 parent c1a2988 commit ff5d3df
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,12 @@ func (c *Controller) startWorkers(stopCh <-chan struct{}) {
}
}, 6*time.Minute, stopCh)

go wait.Until(func() {
if err := c.inspectPod(); err != nil {
klog.Errorf("inspection error: %v", err)
}
}, 20*time.Second, stopCh)

if c.config.EnableExternalVpc {
go wait.Until(func() {
c.syncExternalVpc()
Expand Down
89 changes: 89 additions & 0 deletions pkg/controller/inspection.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package controller

import (
"fmt"
"github.com/kubeovn/kube-ovn/pkg/ovs"
"github.com/kubeovn/kube-ovn/pkg/util"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog"
"net"
"strings"
)

func (c *Controller) inspectPod() error {
klog.V(4).Infof("start inspection")
pods, err := c.podsLister.List(labels.Everything())
if err != nil {
klog.Errorf("failed to list ip, %v", err)
return err
}
lsps, err := c.ovnClient.ListLogicalSwitchPort(c.config.EnableExternalVpc)
if err != nil {
klog.Errorf("failed to list logical switch port, %v", err)
return err
}
for _, pod := range pods {
if pod.Spec.HostNetwork {
continue
}
podNets, err := c.getPodKubeovnNets(pod)
if err != nil {
klog.Errorf("failed to list pod subnets, %v", err)
return err
}
for _, podNet := range filterSubnets(pod, podNets) {
if podNet.Type != providerTypeIPAM {
portName := ovs.PodNameToPortName(pod.Name, pod.Namespace, podNet.ProviderName)
isLspExist := false
for _, lsp := range lsps {
if portName == lsp {
isLspExist = true
}
}
if !isLspExist {
if err := c.ovnClient.DeleteLogicalSwitchPort(portName); err != nil {
klog.Errorf("failed to delete lsp %s, %v", portName, err)
return err
}
ipStr := pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)]
mac := pod.Annotations[fmt.Sprintf(util.MacAddressAnnotationTemplate, podNet.ProviderName)]
portSecurity := false
if pod.Annotations[fmt.Sprintf(util.PortSecurityAnnotationTemplate, podNet.ProviderName)] == "true" {
portSecurity = true
}
securityGroupAnnotation := pod.Annotations[fmt.Sprintf(util.SecurityGroupAnnotationTemplate, podNet.ProviderName)]
vips := pod.Annotations[fmt.Sprintf(util.PortVipAnnotationTemplate, podNet.ProviderName)]
for _, ip := range strings.Split(vips, ",") {
if ip != "" && net.ParseIP(ip) == nil {
klog.Errorf("invalid vip address '%s' for pod %s", ip, pod.Name)
vips = ""
break
}
}
klog.Infof("start rebuild lsp %s with ip %s, mac %s", portName, ipStr, mac)
if err := c.ovnClient.CreatePort(podNet.Subnet.Name, portName, ipStr, mac, pod.Name, pod.Namespace,
portSecurity, securityGroupAnnotation, vips); err != nil {
c.recorder.Eventf(pod, v1.EventTypeWarning, "CreateOVNPortFailed", err.Error())
return err
}
}
}
}
}
return nil
}

func filterSubnets(pod *v1.Pod, nets []*kubeovnNet) []*kubeovnNet {

if pod.Annotations == nil {
return nets
}
result := make([]*kubeovnNet, 0, len(nets))
for _, n := range nets {
if pod.Annotations[fmt.Sprintf(util.AllocatedAnnotationTemplate, n.ProviderName)] == "true" {
result = append(result, n)
}
}
return result
}

0 comments on commit ff5d3df

Please sign in to comment.