Merge pull request #5 from pfl/release-1.1.1

Release 1.1.1

Author: tkatila

Makefile

@@ -50,7 +50,7 @@ endif
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
 OPERATOR_SDK_VERSION ?= v1.37.0
 # Image URL to use all building/pushing image targets
-TAG ?= latest
+TAG ?= 1.1.1
 IMG ?= ${IMAGE_TAG_BASE}:${TAG}
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.31.0
@@ -231,7 +231,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 KUSTOMIZE_VERSION ?= v5.3.0
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 ENVTEST_VERSION ?= release-0.17
-GOLANGCI_LINT_VERSION ?= v1.64.7
+GOLANGCI_LINT_VERSION ?= v1.64.8
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

charts/network-operator/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: intel-network-operator
 description: A Helm chart for Intel Network Operator for Kubernetes
 type: application
-version: 1.1.0
-appVersion: "1.1.0"
+version: 1.1.1
+appVersion: "1.1.1"
 
 dependencies:
   - name: node-feature-discovery
@@ -15,6 +15,6 @@ dependencies:
 annotations:
   org.opencontainers.image.url: "https://github.com/intel/network-operator"
   org.opencontainers.image.source: "https://github.com/intel/network-operator"
-  org.opencontainers.image.version: "1.1.0"
+  org.opencontainers.image.version: "1.1.1"
   org.opencontainers.image.title: "Intel Network Operator"
   org.opencontainers.image.description: "This chart installs the Intel Network Operator for Kubernetes."

charts/network-operator/values.yaml

@@ -3,7 +3,7 @@ logLevel: 2
 operator:
   image:
     repository: intel/intel-network-operator
-    tag: 1.1.0
+    tag: 1.1.1
     imagePullPolicy: IfNotPresent
   resources:
     limits:
@@ -30,7 +30,7 @@ config:
     networkMetrics: false
     image:
       repository: intel/intel-network-linkdiscovery
-      tag: 1.1.0
+      tag: 1.1.1
       imagePullPolicy: IfNotPresent
     nodeSelector:
       intel.feature.node.kubernetes.io/gaudi-ready: "true"

cmd/discover/main.go

@@ -95,6 +95,13 @@ func detectLLDP(config *cmdConfig, networkConfigs map[string]*networkConfigurati
 	lldpResultChan := make(chan lldp.DiscoveryResult, len(networkConfigs))
 	timeoutctx, cancelctx := context.WithTimeout(config.ctx, config.timeout)
 
+	filterFunc := func(portDescription string) bool {
+		// Check if the port description field has the correct data in it
+		_, _, err := parseIPFromString(portDescription)
+
+		return err == nil
+	}
+
 	defer cancelctx()
 
 	for _, networkconfig := range networkConfigs {
@@ -107,7 +114,7 @@ func detectLLDP(config *cmdConfig, networkConfigs map[string]*networkConfigurati
 		wg.Add(1)
 		go func() {
 			lldpClient := lldp.NewClient(timeoutctx, networkconfig.link.Attrs().Name, *networkconfig.localHwAddr)
-			if err := lldpClient.Start(lldpResultChan); err != nil {
+			if err := lldpClient.Start(lldpResultChan, filterFunc); err != nil {
 				klog.Infof("Cannot start LLDP client: %v\n", err)
 			}
 			wg.Done()

cmd/discover/network.go

@@ -213,6 +213,15 @@ func getNetworkConfigs(interfaces []string) ([]string, map[string]*networkConfig
 	return allinterfaces, links, nil
 }
 
+func parseIPFromString(portDescription string) (net.IP, *net.IPNet, error) {
+	substrings := strings.Split(portDescription, " ")
+	if len(substrings) < 2 {
+		return nil, nil, fmt.Errorf("port description field doesn't follow expected format (no-alert CIDR)")
+	}
+
+	return net.ParseCIDR(substrings[1])
+}
+
 func selectMask30L3Address(nwconfig *networkConfiguration) (*net.IP, *net.IP, error) {
 	var (
 		peerNetwork *net.IPNet
@@ -221,15 +230,9 @@ func selectMask30L3Address(nwconfig *networkConfiguration) (*net.IP, *net.IP, er
 		err         error
 	)
 
-	substrings := strings.Split(nwconfig.portDescription, " ")
-	if len(substrings) < 2 {
-		return nil, nil, fmt.Errorf("interface '%s' could not split string '%s'",
-			nwconfig.link.Attrs().Name, nwconfig.portDescription)
-	}
-
-	peeraddr, peerNetwork, err = net.ParseCIDR(substrings[1])
+	peeraddr, peerNetwork, err = parseIPFromString(nwconfig.portDescription)
 	if err != nil {
-		return nil, nil, fmt.Errorf("interface '%s' could not parse '%s': %v",
+		return nil, nil, fmt.Errorf("interface '%s' could not parse CIDR from port description '%s': %v",
 			nwconfig.link.Attrs().Name, nwconfig.portDescription, err)
 	}
 

config/operator/manager/manager.yaml

@@ -64,7 +64,7 @@ spec:
         args:
           - --leader-elect
           - --health-probe-bind-address=:8081
-        image: intel/intel-network-operator:1.1.0
+        image: intel/intel-network-operator:1.1.1
         name: manager
         env:
           - name: OPERATOR_NAMESPACE

config/operator/samples/gaudi-l2.yaml

@@ -6,7 +6,7 @@ spec:
   configurationType: gaudi-so
   gaudiScaleOut:
     layer: L2
-    image: intel/intel-network-linkdiscovery:1.1.0
+    image: intel/intel-network-linkdiscovery:1.1.1
     pullPolicy: IfNotPresent
   logLevel: 1
   nodeSelector:

config/operator/samples/gaudi-l3-metrics.yaml

@@ -7,7 +7,7 @@ spec:
   gaudiScaleOut:
     layer: L3
     networkMetrics: true
-    image: intel/intel-network-linkdiscovery:1.1.0
+    image: intel/intel-network-linkdiscovery:1.1.1
     pullPolicy: IfNotPresent
   logLevel: 1
   nodeSelector:

config/operator/samples/gaudi-l3-pfc-lldpad-enabled.yaml

@@ -8,7 +8,7 @@ spec:
     layer: L3
     pfcPriorities: "11110000"
     enableLLDPAD: true
-    image: intel/intel-network-linkdiscovery:1.1.0
+    image: intel/intel-network-linkdiscovery:1.1.1
     pullPolicy: IfNotPresent
   logLevel: 1
   nodeSelector:

config/operator/samples/gaudi-l3.yaml

@@ -6,7 +6,7 @@ spec:
   configurationType: gaudi-so
   gaudiScaleOut:
     layer: L3
-    image: intel/intel-network-linkdiscovery:1.1.0
+    image: intel/intel-network-linkdiscovery:1.1.1
     pullPolicy: IfNotPresent
   logLevel: 1
   nodeSelector: