Bump and replace network controller used resources

cmd/network-helper/main.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	ctlcni "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io"
 	"github.com/urfave/cli"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog"
 
 	"github.com/harvester/harvester-network-controller/pkg/controller/manager/nad"
+	ctlcni "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io"
 	"github.com/harvester/harvester-network-controller/pkg/helper"
 	"github.com/harvester/harvester-network-controller/pkg/utils"
 )

cmd/webhook/main.go

@@ -5,10 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	ctlcni "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io"
-	ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
-	ctlkubevirt "github.com/harvester/harvester/pkg/generated/controllers/kubevirt.io"
-	ctlkubevirtv1 "github.com/harvester/harvester/pkg/generated/controllers/kubevirt.io/v1"
 	"github.com/harvester/harvester/pkg/indexeres"
 	"github.com/harvester/webhook/pkg/config"
 	"github.com/harvester/webhook/pkg/server"
@@ -22,6 +18,10 @@ import (
 	"k8s.io/client-go/rest"
 	kubevirtv1 "kubevirt.io/api/core/v1"
 
+	ctlcni "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io"
+	ctlcniv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io/v1"
+	ctlkubevirt "github.com/harvester/harvester-network-controller/pkg/generated/controllers/kubevirt.io"
+	ctlkubevirtv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/kubevirt.io/v1"
 	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
 	ctlnetworkv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/webhook/clusternetwork"

manifests/crds/network.harvesterhci.io_clusternetworks.yaml

@@ -1,3 +1,4 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -68,3 +69,9 @@ spec:
         type: object
     served: true
     storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

manifests/crds/network.harvesterhci.io_linkmonitors.yaml

@@ -1,3 +1,4 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -114,3 +115,9 @@ spec:
         type: object
     served: true
     storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

manifests/crds/network.harvesterhci.io_vlanconfigs.yaml

@@ -1,3 +1,4 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -105,3 +106,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

manifests/crds/network.harvesterhci.io_vlanstatuses.yaml

@@ -1,3 +1,4 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -111,3 +112,9 @@ spec:
     served: true
     storage: true
     subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

pkg/apis/network.harvesterhci.io/v1beta1/linkmonitor.go

@@ -33,7 +33,7 @@ type LinkMonitorStatus struct {
 	// +optional
 	Conditions []Condition `json:"conditions,omitempty"`
 	// +optional
-	LinkStatus map[string][]LinkStatus `json:"linkStatus,omitempty"`
+	LinkStatus map[string]LinkStatusList `json:"linkStatus,omitempty"`
 }
 
 type TargetLinkRule struct {
@@ -45,6 +45,8 @@ type TargetLinkRule struct {
 	NameRule string `json:"nameRule,omitempty"`
 }
 
+type LinkStatusList []LinkStatus
+
 type LinkStatus struct {
 	Name string `json:"name"`
 	// +optional

pkg/codegen/main.go

@@ -1,10 +1,16 @@
 package main
 
 import (
+	"bytes"
+	"io/ioutil"
 	"os"
+	"path/filepath"
 
+	cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
 	"github.com/rancher/wrangler/pkg/controller-gen/args"
+	"github.com/sirupsen/logrus"
+	kubevirtv1 "kubevirt.io/api/core/v1"
 
 	networkv1 "github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io/v1beta1"
 )
@@ -25,6 +31,40 @@ func main() {
 				GenerateTypes:   true,
 				GenerateClients: true,
 			},
+			kubevirtv1.SchemeGroupVersion.Group: {
+				Types: []interface{}{
+					kubevirtv1.VirtualMachineInstance{},
+				},
+				GenerateTypes:   false,
+				GenerateClients: true,
+			},
+			cniv1.SchemeGroupVersion.Group: {
+				Types: []interface{}{
+					cniv1.NetworkAttachmentDefinition{},
+				},
+				GenerateTypes:   false,
+				GenerateClients: true,
+			},
 		},
 	})
+	nadControllerInterfaceRefactor()
+}
+
+// Copied from https://github.com/harvester/harvester/blob/190485f4c746400ea3db1b1003acc31c0f731f16/pkg/codegen/main.go#L187
+// NB(GC), nadControllerInterfaceRefactor modify the generated resource name of NetworkAttachmentDefinition controller using a dash-separator,
+// the original code is generated by https://github.com/rancher/wrangler/blob/e86bc912dfacbc81dc2d70171e4d103248162da6/pkg/controller-gen/generators/group_version_interface_go.go#L82-L97
+// since the NAD crd uses a varietal plurals name(i.e network-attachment-definitions), and the default resource name generated by wrangler is
+// `networkattachementdefinitions` that will raises crd not found exception of the NAD controller.
+func nadControllerInterfaceRefactor() {
+	absPath, _ := filepath.Abs("pkg/generated/controllers/k8s.cni.cncf.io/v1/interface.go")
+	input, err := ioutil.ReadFile(absPath)
+	if err != nil {
+		logrus.Fatalf("failed to read the network-attachment-definition file: %v", err)
+	}
+
+	output := bytes.Replace(input, []byte("networkattachmentdefinitions"), []byte("network-attachment-definitions"), -1)
+
+	if err = ioutil.WriteFile(absPath, output, 0600); err != nil {
+		logrus.Fatalf("failed to update the network-attachment-definition file: %v", err)
+	}
 }

pkg/config/context.go

@@ -3,7 +3,6 @@ package config
 import (
 	"context"
 
-	ctlcni "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io"
 	"github.com/harvester/harvester/pkg/util/crd"
 	cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	"github.com/rancher/lasso/pkg/controller"
@@ -24,6 +23,7 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	networkv1 "github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io/v1beta1"
+	ctlcni "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io"
 	ctlnetwork "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io"
 )
 

pkg/controller/agent/linkmonitor/controller.go

@@ -3,6 +3,7 @@ package linkmonitor
 import (
 	"context"
 	"fmt"
+	"reflect"
 
 	ctlcorev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/vishvananda/netlink"
@@ -154,19 +155,20 @@ func linkToLinkStatus(l netlink.Link) networkv1.LinkStatus {
 	return linkStatus
 }
 
-func (h Handler) updateStatus(lm *networkv1.LinkMonitor, linkStatusList []networkv1.LinkStatus) error {
-	var currentLinkStatusList []networkv1.LinkStatus
+func (h Handler) updateStatus(lm *networkv1.LinkMonitor, linkStatusList networkv1.LinkStatusList) error {
+	var currentLinkStatusList networkv1.LinkStatusList
 	if lm.Status.LinkStatus != nil {
 		currentLinkStatusList = lm.Status.LinkStatus[h.nodeName]
 	}
-	if compareLinkStatusList(currentLinkStatusList, linkStatusList) {
+
+	if reflect.DeepEqual(currentLinkStatusList, linkStatusList) {
 		return nil
 	}
 
 	lmCopy := lm.DeepCopy()
 
-	if lm.Status.LinkStatus == nil {
-		lmCopy.Status.LinkStatus = make(map[string][]networkv1.LinkStatus)
+	if lmCopy.Status.LinkStatus == nil {
+		lmCopy.Status.LinkStatus = make(map[string]networkv1.LinkStatusList)
 	}
 	lmCopy.Status.LinkStatus[h.nodeName] = linkStatusList
 
@@ -177,27 +179,13 @@ func (h Handler) updateStatus(lm *networkv1.LinkMonitor, linkStatusList []networ
 	return nil
 }
 
-func compareLinkStatusList(m, n []networkv1.LinkStatus) bool {
-	if len(m) != len(n) {
-		return false
-	}
-
-	for i, linkStatus := range m {
-		if linkStatus != n[i] {
-			return false
-		}
-	}
-
-	return true
-}
-
 func (h Handler) syncLinkStatus(lm *networkv1.LinkMonitor) error {
 	pattern := h.linkMonitor.GetPattern(lm.Name)
 	links, err := h.linkMonitor.ScanLinks(pattern)
 	if err != nil {
 		return err
 	}
-	linkStatusList := make([]networkv1.LinkStatus, len(links))
+	linkStatusList := make(networkv1.LinkStatusList, len(links))
 	for i, link := range links {
 		linkStatusList[i] = linkToLinkStatus(link)
 	}

pkg/controller/agent/nad/controller.go

@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"strconv"
 
-	ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	nadv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	"github.com/vishvananda/netlink"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/klog"
 
 	"github.com/harvester/harvester-network-controller/pkg/config"
+	ctlcniv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	"github.com/harvester/harvester-network-controller/pkg/network/vlan"
 	"github.com/harvester/harvester-network-controller/pkg/utils"
 )

pkg/controller/agent/vlanconfig/controller.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 
-	ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	ctlcorev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/vishvananda/netlink"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -18,6 +17,7 @@ import (
 	networkv1 "github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/config"
 	"github.com/harvester/harvester-network-controller/pkg/controller/agent/nad"
+	ctlcniv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	ctlnetworkv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/network/iface"
 	"github.com/harvester/harvester-network-controller/pkg/network/vlan"

pkg/controller/manager/clusternetwork/controller.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 
 	"github.com/cenk/backoff"
-	ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/klog/v2"
 
 	networkv1 "github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/config"
+	ctlcniv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	ctlnetworkv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/network/iface"
 	"github.com/harvester/harvester-network-controller/pkg/utils"

pkg/controller/manager/nad/controller.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/go-ping/ping"
-	ctlcniv1 "github.com/harvester/harvester/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	cniv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	ctlbatchv1 "github.com/rancher/wrangler/pkg/generated/controllers/batch/v1"
 	batchv1 "k8s.io/api/batch/v1"
@@ -22,6 +21,7 @@ import (
 	"github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io"
 	networkv1 "github.com/harvester/harvester-network-controller/pkg/apis/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/config"
+	ctlcniv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/k8s.cni.cncf.io/v1"
 	ctlnetworkv1 "github.com/harvester/harvester-network-controller/pkg/generated/controllers/network.harvesterhci.io/v1beta1"
 	"github.com/harvester/harvester-network-controller/pkg/network/iface"
 	"github.com/harvester/harvester-network-controller/pkg/utils"