Sanity

Author: kkumar

plugins/oob/k8s.go

@@ -5,7 +5,6 @@ package oob
 
 import (
 	"context"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -90,7 +89,7 @@ func (k K8sClient) getIp(
 	if len(subnetNames) == 0 {
 		return nil, errors.New("No OOB subnets found")
 	} else {
-		log.Infof("%d OOB subnets found: %s", len(subnetNames), strings.Join(subnetNames, " "))
+		log.Debugf("%d OOB subnets found: %s", len(subnetNames), strings.Join(subnetNames, " "))
 		subnetMatch := false
 		for _, subnetName := range subnetNames {
 			subnet, err := k.getMatchingSubnet(subnetName, ipaddr)
@@ -100,7 +99,7 @@ func (k K8sClient) getIp(
 			if subnet == nil {
 				continue
 			}
-			log.Infof("Selecting subnet %s/%s", k.Namespace, subnetName)
+			log.Debugf("Selecting subnet %s/%s", k.Namespace, subnetName)
 			subnetMatch = true
 
 			ipamIP, err = k.prepareCreateIpamIP(subnetName, macKey)
@@ -241,7 +240,7 @@ func (k K8sClient) doCreateIpamIP(
 	} else {
 		ipamIP, err = k.waitForCreation(ipamIP)
 		if err != nil {
-			return nil, fmt.Errorf("failed to create IP %s/%s: %w", ipamIP.Namespace, ipamIP.Name, err)
+			return nil, fmt.Errorf("failed to create IP %w", err)
 		} else {
 			log.Infof("New IP %s (%s/%s) created in subnet %s", ipamIP.Status.Reserved.String(),
 				ipamIP.Namespace, ipamIP.Name, ipamIP.Spec.Subnet.Name)
@@ -321,7 +320,7 @@ func (k K8sClient) waitForCreation(ipamIP *ipamv1alpha1.IP) (*ipamv1alpha1.IP, e
 			}
 		}
 	}
-	return ipamIP, errors.New("Timeout reached, IP not created")
+	return nil, errors.New("Timeout reached, IP not created")
 }
 
 func (k K8sClient) getOOBNetworks(subnetType ipamv1alpha1.SubnetAddressType) []string {
@@ -334,12 +333,10 @@ func (k K8sClient) getOOBNetworks(subnetType ipamv1alpha1.SubnetAddressType) []s
 	if err != nil {
 		log.Errorf("Error listing OOB subnets: %v", err)
 	}
-	fmt.Printf("OobLabel: %s", k.OobLabel)
-	fmt.Printf("subnet-list: %v", subnetList)
+
 	oobSubnetNames := []string{}
 	for _, subnet := range subnetList.Items {
 		if subnet.Status.Type == subnetType {
-			fmt.Printf("subnet-names: %s", subnet.Name)
 			oobSubnetNames = append(oobSubnetNames, subnet.Name)
 		}
 	}
@@ -360,18 +357,11 @@ func (k K8sClient) getMatchingSubnet(subnetName string, ipaddr net.IP) (*ipamv1a
 		return nil, fmt.Errorf("failed to get subnet %s/%s: %w", k.Namespace, subnetName, err)
 	}
 	if apierrors.IsNotFound(err) {
-		log.Infof("Cannot select subnet %s/%s, does not exist", k.Namespace, subnetName)
+		log.Debugf("Cannot select subnet %s/%s, does not exist", k.Namespace, subnetName)
 		return nil, nil
 	}
 	if !checkIPInCIDR(ipaddr, existingSubnet.Status.Reserved.String()) && ipaddr.String() != UNKNOWN_IP {
-		log.Infof("Cannot select subnet %s/%s, CIDR mismatch, subnet reserved: %s, ipaddr: %s", k.Namespace, subnetName, existingSubnet.Status.Reserved.String(), ipaddr.String())
-		log.Infof("IP Type: %T, Value: %v", ipaddr, ipaddr)
-		decodedIP, err := hex.DecodeString(ipaddr.String())
-		if err != nil {
-			log.Errorf("Failed to decode IP: %v", err)
-		} else {
-			log.Infof("Decoded IP Address: %s", string(decodedIP))
-		}
+		log.Debugf("Cannot select subnet %s/%s, CIDR mismatch", k.Namespace, subnetName)
 		return nil, nil
 	}
 
@@ -424,7 +414,7 @@ func checkIPInCIDR(ip net.IP, cidrStr string) bool {
 	// Parse the CIDR string
 	_, cidrNet, err := net.ParseCIDR(cidrStr)
 	if err != nil {
-		log.Infof("Error parsing CIDR: %v\n", err)
+		log.Errorf("Error parsing CIDR: %v\n", err)
 		return false
 	}
 

plugins/oob/plugin.go

@@ -107,8 +107,6 @@ func handler6(req, resp dhcpv6.DHCPv6) (dhcpv6.DHCPv6, bool) {
 	ipaddr := make(net.IP, len(relayMsg.LinkAddr))
 	copy(ipaddr, relayMsg.LinkAddr)
 
-	fmt.Printf("k8sclient info: %s", k8sClient.OobLabel)
-
 	log.Infof("Requested IP address from relay %s for mac %s", ipaddr.String(), mac.String())
 	leaseIP, err := k8sClient.getIp(ipaddr, mac, false, ipamv1alpha1.CIPv6SubnetType)
 	if err != nil {
@@ -162,7 +160,7 @@ func setup4(args ...string) (handler.Handler4, error) {
 func handler4(req, resp *dhcpv4.DHCPv4) (*dhcpv4.DHCPv4, bool) {
 	mac := req.ClientHWAddr
 
-	log.Infof("received DHCPv4 packet: %s", req.Summary())
+	log.Debugf("received DHCPv4 packet: %s", req.Summary())
 	log.Tracef("Message type: %s", req.MessageType().String())
 
 	var ipaddr net.IP
@@ -175,23 +173,23 @@ func handler4(req, resp *dhcpv4.DHCPv4) (*dhcpv4.DHCPv4, bool) {
 		// ack requested address
 		exactIP = true
 		ipaddr = clientIP
-		log.Infof("IP client test: %s", ipaddr)
+		log.Debugf("IP client: %v", ipaddr)
 	} else if requestedIP != nil {
 		// ack requested address
 		exactIP = true
 		ipaddr = requestedIP
-		log.Infof("IP client: %v", ipaddr)
+		log.Debugf("IP client: %v", ipaddr)
 	} else if serverIP != nil {
 		// no client information, use server address for subnet detection
 		exactIP = false
 		ipaddr = serverIP
-		log.Infof("IP server: %v", ipaddr)
+		log.Debugf("IP server: %v", ipaddr)
 	} else {
 		ipaddr = net.ParseIP(UNKNOWN_IP)
 		exactIP = false
 	}
 
-	log.Infof("IP: %v", ipaddr)
+	log.Debugf("IP: %v", ipaddr)
 	leaseIP, err := k8sClient.getIp(ipaddr, mac, exactIP, ipamv1alpha1.CIPv4SubnetType)
 	if err != nil {
 		log.Errorf("Could not get IPAM IP: %s", err)
@@ -200,7 +198,7 @@ func handler4(req, resp *dhcpv4.DHCPv4) (*dhcpv4.DHCPv4, bool) {
 
 	resp.YourIPAddr = leaseIP
 
-	log.Infof("Sent DHCPv4 response: %s", resp.Summary())
+	log.Debugf("Sent DHCPv4 response: %s", resp.Summary())
 
 	return resp, false
 }