diff --git a/.github/workflows/static-scan.yml b/.github/workflows/static-scan.yml
index 685c4dac..bab6e5c8 100644
--- a/.github/workflows/static-scan.yml
+++ b/.github/workflows/static-scan.yml
@@ -12,11 +12,21 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+      - name: remove deployer container from dockerfile
+        run: sed -ie '/End of builder/,+5d' ./docker/userspacecni/Dockerfile
+      - name: Build the Docker image
+        run: docker build . -f ./docker/userspacecni/Dockerfile -t userspacecni:latest
+      - name: run container
+        run: docker run --name userspacecni -itd userspacecni:latest bash
+      - name: docker copy generated bin api files
+        run: docker cp userspacecni:/root/userspace-cni-network-plugin/cnivpp ./
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@5c56cd6c9dc07901af25baab6f2b0d9f3b7c3018 # v2.5.2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.52.2
+          args: --timeout=20m
 
   shellcheck:
     name: Shellcheck
@@ -30,6 +40,7 @@ jobs:
     - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
     - name: Run ShellCheck
       uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 # master
+
   hadolint:
     runs-on: ubuntu-latest
     name: Hadolint
@@ -39,11 +50,12 @@ jobs:
       with:
         egress-policy: audit
 
-    - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
-    - uses: brpaz/hadolint-action@7e374b112fd3e7e6ea346131c40e17c7254f64bf # v1.2.1
+    - uses: actions/checkout@v3
+    - uses: hadolint/hadolint-action@v3.1.0
       name: Run Hadolint
       with:
-       dockerfile: Dockerfile
+       dockerfile: ./docker/userspacecni/Dockerfile
+       ignore: DL3008,DL3059
 
   go-check:
     runs-on: ubuntu-latest
@@ -55,15 +67,26 @@ jobs:
 
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
+    - name: remove deployer container from dockerfile
+      run: sed -ie '/End of builder/,+5d' ./docker/userspacecni/Dockerfile
+    - name: Build the Docker image
+      run: docker build . -f ./docker/userspacecni/Dockerfile -t userspacecni:latest
+    - name: run container
+      run: docker run --name userspacecni -itd userspacecni:latest bash
+    - name: docker copy generated bin api files
+      run: docker cp userspacecni:/root/userspace-cni-network-plugin/cnivpp ./
+
     - name: Set up Go
       uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
       with:
-        go-version: 1.18.x
+        go-version: 1.20.1
 
+    - name: checkout dockerfile to avoid false diff
+      run: git checkout ./docker/userspacecni/Dockerfile
     # if this fails, run go mod tidy
     - name: Check if module files are consistent with code
-      run: go mod tidy && git diff --exit-code
+      run: go mod tidy && go get go.fd.io/govpp/binapigen/vppapi@v0.7.0 && git diff --exit-code #need package for bin api but not working with tidy
 
     # if this fails, run go mod vendor
     - name: Check if vendor directory is consistent with go modules
-      run: go mod vendor && git diff --exit-code
\ No newline at end of file
+      run: go mod vendor && git diff --exit-code
diff --git a/Makefile b/Makefile
index 595e1418..65be9c86 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ endif
 endif
 
 install:
-	go get git.fd.io/govpp.git/cmd/binapi-generator@v0.3.5
+	go get go.fd.io/govpp/cmd/binapi-generator@v0.3.5
 ifeq ($(VPPINSTALLED),0)
 	@echo VPP not installed, installing required files. Run *sudo make clean* to remove installed files.
 	@mkdir -p tmpvpp/
diff --git a/cniovs/cniovs.go b/cniovs/cniovs.go
index 9b2ca50d..6e047c3b 100644
--- a/cniovs/cniovs.go
+++ b/cniovs/cniovs.go
@@ -41,30 +41,24 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 
 	"github.com/intel/userspace-cni-network-plugin/logging"
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )
 
-//
 // Constants
-//
 const (
 	defaultBridge               = "br0"
 	DefaultHostVhostuserBaseDir = "/var/lib/vhost_sockets/"
 )
 
-//
 // Types
-//
 type CniOvs struct {
 }
 
-//
 // API Functions
-//
 func (cniOvs CniOvs) AddOnHost(conf *types.NetConf,
 	args *skel.CmdArgs,
 	kubeClient kubernetes.Interface,
@@ -196,7 +190,11 @@ func (cniOvs CniOvs) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
 func (cniOvs CniOvs) DelFromContainer(conf *types.NetConf, args *skel.CmdArgs, sharedDir string, pod *v1.Pod) error {
 	logging.Infof("OVS DelFromContainer: ENTER - Container %s Iface %s", args.ContainerID[:12], args.IfName)
 
-	configdata.FileCleanup(sharedDir, "")
+	var err = configdata.FileCleanup(sharedDir, "")
+
+	if err != nil {
+		logging.Debugf("DelFromContainer(ovs): %v", err)
+	}
 
 	return nil
 }
@@ -243,7 +241,7 @@ func createSharedDir(sharedDir, oldSharedDir string) error {
 	if os.IsNotExist(err) {
 		err = os.MkdirAll(sharedDir, 0750)
 		if err != nil {
-			logging.Errorf("createSharedDir: Failed to create dir (%s): %v", sharedDir, err)
+			_ = logging.Errorf("createSharedDir: Failed to create dir (%s): %v", sharedDir, err)
 			return err
 		}
 
@@ -251,7 +249,7 @@ func createSharedDir(sharedDir, oldSharedDir string) error {
 			logging.Debugf("createSharedDir: Mount from %s to %s", oldSharedDir, sharedDir)
 			err = unix.Mount(oldSharedDir, sharedDir, "", unix.MS_BIND, "")
 			if err != nil {
-				logging.Errorf("createSharedDir: Failed to bind mount: %s", err)
+				_ = logging.Errorf("createSharedDir: Failed to bind mount: %s", err)
 				return err
 			}
 		}
@@ -296,7 +294,7 @@ func addLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 	sharedDir := getShortSharedDir(actualSharedDir)
 	err = createSharedDir(sharedDir, actualSharedDir)
 	if err != nil {
-		logging.Errorf("addLocalDeviceVhost: Failed to create shared dir: %v", err)
+		_ = logging.Errorf("addLocalDeviceVhost: Failed to create shared dir: %v", err)
 		return err
 	}
 
@@ -304,7 +302,7 @@ func addLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 	if group != "" {
 		err = setSharedDirGroup(sharedDir, group)
 		if err != nil {
-			logging.Errorf("addLocalDeviceVhost: Failed to set shared dir group: %v", err)
+			_ = logging.Errorf("addLocalDeviceVhost: Failed to set shared dir group: %v", err)
 			return err
 		}
 	}
@@ -341,7 +339,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 	// ovs-vsctl --if-exists del-port
 	err := deleteVhostPort(data.Vhostname, conf.HostConf.BridgeConf.BridgeName)
 	if err != nil {
-		logging.Errorf("delLocalDeviceVhost: Failed to delete port: %v", err)
+		_ = logging.Errorf("delLocalDeviceVhost: Failed to delete port: %v", err)
 		return err
 	}
 
@@ -350,17 +348,17 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 		logging.Debugf("delLocalDeviceVhost: Unmount shared directory: %v", sharedDir)
 		_, err = os.Stat(sharedDir)
 		if os.IsNotExist(err) {
-			logging.Errorf("delLocalDeviceVhost: shared directory %s does not exist to unmount", sharedDir)
+			_ = logging.Errorf("delLocalDeviceVhost: shared directory %s does not exist to unmount", sharedDir)
 			return nil
 		}
 		err = unix.Unmount(sharedDir, 0)
 		if err != nil {
-			logging.Errorf("Failed to unmount dir: %v", err)
+			_ = logging.Errorf("Failed to unmount dir: %v", err)
 			return err
 		}
 		err = os.Remove(sharedDir)
 		if err != nil {
-			logging.Errorf("Failed to remove dir: %v", err)
+			_ = logging.Errorf("Failed to remove dir: %v", err)
 			return err
 		}
 	} else {
@@ -379,7 +377,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 
 		// Remove files with matching container ID and IfName
 		for _, fileName := range filesForContainerID {
-			if match, _ := regexp.MatchString(fileBaseName+"*", fileName); match == true {
+			if match, _ := regexp.MatchString(fileBaseName+"*", fileName); match {
 				logging.Debugf("OVS DelFromContainer: %s matches file %s", fileBaseName, fileName)
 				file := filepath.Join(sharedDir, fileName)
 				if err = os.Remove(file); err != nil {
@@ -392,7 +390,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 
 			// In case the Socketfile name was passed in:
 			if conf.HostConf.VhostConf.Socketfile != fileBaseName {
-				if match, _ := regexp.MatchString(conf.HostConf.VhostConf.Socketfile+"*", fileName); match == true {
+				if match, _ := regexp.MatchString(conf.HostConf.VhostConf.Socketfile+"*", fileName); match {
 					file := filepath.Join(sharedDir, fileName)
 					if err = os.Remove(file); err != nil {
 						return err
@@ -415,7 +413,7 @@ func delLocalDeviceVhost(conf *types.NetConf, args *skel.CmdArgs, actualSharedDi
 func addLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) error {
 	var err error
 
-	if found := findBridge(conf.HostConf.BridgeConf.BridgeName); found == false {
+	if found := findBridge(conf.HostConf.BridgeConf.BridgeName); !found {
 		logging.Debugf("addLocalNetworkBridge(): Bridge %s not found, creating", conf.HostConf.BridgeConf.BridgeName)
 		err = createBridge(conf.HostConf.BridgeConf.BridgeName)
 
@@ -438,7 +436,7 @@ func addLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSav
 func delLocalNetworkBridge(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) error {
 	var err error
 
-	if containInterfaces := doesBridgeContainInterfaces(conf.HostConf.BridgeConf.BridgeName); containInterfaces == false {
+	if containInterfaces := doesBridgeContainInterfaces(conf.HostConf.BridgeConf.BridgeName); !containInterfaces {
 		logging.Debugf("delLocalNetworkBridge(): No interfaces found, deleting Bridge %s", conf.HostConf.BridgeConf.BridgeName)
 		err = deleteBridge(conf.HostConf.BridgeConf.BridgeName)
 	} else {
diff --git a/cniovs/cniovs_test.go b/cniovs/cniovs_test.go
index 018b7afd..1970cedf 100644
--- a/cniovs/cniovs_test.go
+++ b/cniovs/cniovs_test.go
@@ -17,7 +17,6 @@ package cniovs
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path"
@@ -26,7 +25,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 	"github.com/intel/userspace-cni-network-plugin/userspace/testdata"
@@ -83,7 +82,7 @@ func TestAddOnHost(t *testing.T) {
 			var result *current.Result
 			args := testdata.GetTestArgs()
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(sharedDir)
 
@@ -113,7 +112,7 @@ func TestAddOnContainer(t *testing.T) {
 		args := testdata.GetTestArgs()
 		ovs := CniOvs{}
 
-		sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+		sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 		require.NoError(t, dirErr, "Can't create temporary directory")
 		defer os.RemoveAll(sharedDir)
 
@@ -131,7 +130,7 @@ func TestDelOnContainer(t *testing.T) {
 		args := testdata.GetTestArgs()
 		ovs := CniOvs{}
 
-		sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+		sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 		require.NoError(t, dirErr, "Can't create temporary directory")
 		// just in case that DelFromContainer fails
 		defer os.RemoveAll(sharedDir)
@@ -191,10 +190,10 @@ func TestDelFromHost(t *testing.T) {
 			}
 			path := path.Join(localDir, fileName)
 
-			require.NoError(t, ioutil.WriteFile(path, []byte(tc.savedData), 0644), "Can't create test file")
+			require.NoError(t, os.WriteFile(path, []byte(tc.savedData), 0644), "Can't create test file")
 			defer os.Remove(path)
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(sharedDir)
 
@@ -217,10 +216,10 @@ func TestGenerateRandomMacAddress(t *testing.T) {
 	nr := 10
 	t.Run(fmt.Sprintf("generate %v random MAC addresses", nr), func(t *testing.T) {
 		macs := make(map[string]int)
+		mac_regex := regexp.MustCompile("^[0-9a-fA-F]{2}(:([0-9a-fA-F]){2}){5}$")
 		for i := 0; i < nr; i++ {
 			mac := generateRandomMacAddress()
-			ok, err := regexp.Match("^[0-9a-fA-F]{2}(:([0-9a-fA-F]){2}){5}$", []byte(mac))
-			require.NoError(t, err, fmt.Sprintf("MAC is incorrect. MAC: %q", mac))
+			ok := mac_regex.Match([]byte(mac))
 			require.True(t, ok, fmt.Sprintf("MAC is incorrect. MAC: %q", mac))
 			macs[mac]++
 		}
@@ -315,7 +314,7 @@ func TestCreateSharedDir(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			sharedDirNoPath := strings.Split(sharedDir, "/")[2]
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			tc.sharedDir = strings.Replace(tc.sharedDir, "#sharedDir#", sharedDir, -1)
@@ -332,7 +331,7 @@ func TestCreateSharedDir(t *testing.T) {
 			}
 
 			// cleanup
-			unix.Unmount(tc.sharedDir, 0)
+			_ = unix.Unmount(tc.sharedDir, 0)
 			os.RemoveAll(tc.sharedDir)
 			os.RemoveAll(tc.oldSharedDir)
 
@@ -368,7 +367,7 @@ func TestSetSharedDirGroup(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			tc.sharedDir = strings.Replace(tc.sharedDir, "#sharedDir#", sharedDir, -1)
 			defer os.RemoveAll(sharedDir)
@@ -377,7 +376,7 @@ func TestSetSharedDirGroup(t *testing.T) {
 			if tc.group == "#group#" {
 				dirInfo, _ := os.Stat(sharedDir)
 				dirSys := dirInfo.Sys().(*syscall.Stat_t)
-				group, _ := user.LookupGroupId(string(48 + dirSys.Gid))
+				group, _ := user.LookupGroupId(string(rune(48 + dirSys.Gid)))
 				tc.group = group.Name
 			}
 
@@ -458,7 +457,7 @@ func TestAddLocalDeviceVhost(t *testing.T) {
 			args := testdata.GetTestArgs()
 			execCommand := &FakeExecCommand{Err: tc.fakeErr}
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			if !tc.createDir {
 				require.NoError(t, os.RemoveAll(sharedDir))
@@ -483,7 +482,7 @@ func TestAddLocalDeviceVhost(t *testing.T) {
 					defer os.RemoveAll(defaultOvSSocketDir)
 				}
 				path := path.Join(defaultOvSSocketDir, socketFile)
-				require.NoError(t, ioutil.WriteFile(path, []byte(""), 0644), "Can't create test file")
+				require.NoError(t, os.WriteFile(path, []byte(""), 0644), "Can't create test file")
 				defer os.Remove(path)
 
 			}
@@ -515,9 +514,9 @@ func createSocket(t *testing.T, dir, socket string, isDir bool) (socketPath stri
 	if isDir {
 		// error case - create dir instead of file and create file inside it
 		require.NoError(t, os.MkdirAll(socketPath, 0700), "Can't create test directory")
-		require.NoError(t, ioutil.WriteFile(path.Join(socketPath, socket), []byte(""), 0644), "Can't create test file")
+		require.NoError(t, os.WriteFile(path.Join(socketPath, socket), []byte(""), 0644), "Can't create test file")
 	} else {
-		require.NoError(t, ioutil.WriteFile(socketPath, []byte(""), 0644), "Can't create test file")
+		require.NoError(t, os.WriteFile(socketPath, []byte(""), 0644), "Can't create test file")
 	}
 	return
 }
@@ -658,10 +657,12 @@ func TestDelLocalDeviceVhost(t *testing.T) {
 				// cleanup if needed
 				defer os.RemoveAll(tc.sharedDir)
 				defer os.RemoveAll(sharedDir)
-				defer unix.Unmount(sharedDir, 0)
+				defer func () {
+					_ = unix.Unmount(sharedDir, 0)
+				}()
 			} else {
 				var dirErr error
-				sharedDir, dirErr = ioutil.TempDir("/tmp", "test-cniovs-")
+				sharedDir, dirErr = os.MkdirTemp("/tmp", "test-cniovs-")
 				require.NoError(dirErr, "Can't create temporary directory")
 				switch tc.brokenDir {
 				case "proc":
@@ -669,7 +670,7 @@ func TestDelLocalDeviceVhost(t *testing.T) {
 					sharedDir = "/proc/broken_shared_dir"
 				case "file":
 					require.NoError(os.RemoveAll(sharedDir))
-					require.NoError(ioutil.WriteFile(sharedDir, []byte(""), 0644), "Can't create test file")
+					require.NoError(os.WriteFile(sharedDir, []byte(""), 0644), "Can't create test file")
 					defer os.Remove(sharedDir)
 				}
 				// cleanup if needed
@@ -690,7 +691,7 @@ func TestDelLocalDeviceVhost(t *testing.T) {
 			// prepare noise files, which shall remain and avoid shared dir removal
 			for i := 0; i < tc.noiseFiles; i++ {
 				path := path.Join(sharedDir, fmt.Sprintf("noise-file-%v", i))
-				require.NoError(ioutil.WriteFile(path, []byte(""), 0644), "Can't create test file")
+				require.NoError(os.WriteFile(path, []byte(""), 0644), "Can't create test file")
 				defer os.Remove(path)
 			}
 
diff --git a/cniovs/localdb.go b/cniovs/localdb.go
index c69af6da..9c03b8f9 100644
--- a/cniovs/localdb.go
+++ b/cniovs/localdb.go
@@ -22,7 +22,6 @@ package cniovs
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -76,7 +75,7 @@ func SaveConfig(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) err
 
 		path := filepath.Join(localDir, fileName)
 
-		return ioutil.WriteFile(path, dataBytes, 0644)
+		return os.WriteFile(path, dataBytes, 0644)
 	} else {
 		return fmt.Errorf("ERROR: serializing delegate OVS saved data: %v", err)
 	}
@@ -89,7 +88,7 @@ func LoadConfig(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) err
 	path := filepath.Join(localDir, fileName)
 
 	if _, err := os.Stat(path); err == nil {
-		if dataBytes, err := ioutil.ReadFile(path); err == nil {
+		if dataBytes, err := os.ReadFile(path); err == nil {
 			if err = json.Unmarshal(dataBytes, data); err != nil {
 				return fmt.Errorf("ERROR: Failed to parse OVS saved data: %v", err)
 			}
@@ -102,7 +101,7 @@ func LoadConfig(conf *types.NetConf, args *skel.CmdArgs, data *OvsSavedData) err
 	}
 
 	// Delete file (and directory if empty)
-	configdata.FileCleanup(localDir, path)
+	_ = configdata.FileCleanup(localDir, path)
 
 	return nil
 }
diff --git a/cniovs/localdb_test.go b/cniovs/localdb_test.go
index 97443ac4..d70a33c6 100644
--- a/cniovs/localdb_test.go
+++ b/cniovs/localdb_test.go
@@ -17,7 +17,6 @@ package cniovs
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -106,7 +105,7 @@ func TestLoadConfig(t *testing.T) {
 			case "none":
 				require.NoFileExists(t, path, "Saved configuration shall not exist")
 			case "corrupted":
-				require.NoError(t, ioutil.WriteFile(path, []byte("{"), 0644), "Can't create test file")
+				require.NoError(t, os.WriteFile(path, []byte("{"), 0644), "Can't create test file")
 				defer os.Remove(path)
 			case "directory":
 				require.NoError(t, os.Mkdir(path, 0700), "Can't create test dir")
diff --git a/cniovs/ovsctrl.go b/cniovs/ovsctrl.go
index 60ca651d..fe5b8a3d 100644
--- a/cniovs/ovsctrl.go
+++ b/cniovs/ovsctrl.go
@@ -69,7 +69,7 @@ func createVhostPort(sock_dir string, sock_name string, client bool, bridge_name
 	cmd := "ovs-vsctl"
 	args := []string{"add-port", bridge_name, sock_name, "--", "set", "Interface", sock_name, type_str}
 
-	if client == true {
+	if client {
 		socketarg := "options:vhost-server-path=" + filepath.Join(sock_dir, sock_name)
 		logging.Debugf("Additional string: %s", socketarg)
 
@@ -80,18 +80,18 @@ func createVhostPort(sock_dir string, sock_name string, client bool, bridge_name
 		return "", err
 	}
 
-	if client == false {
+	if !client {
 		// Determine the location OvS uses for Sockets. Default location can be
 		// overwritten with environmental variable: OVS_SOCKDIR
 		ovs_socket_dir, ok := os.LookupEnv("OVS_SOCKDIR")
-		if ok == false {
+		if !ok {
 			ovs_socket_dir = defaultOvSSocketDir
 		}
 
 		// Move socket to defined dir for easier mounting
 		err = os.Rename(filepath.Join(ovs_socket_dir, sock_name), filepath.Join(sock_dir, sock_name))
 		if err != nil {
-			logging.Errorf("Rename ERROR: %v", err)
+			_ = logging.Errorf("Rename ERROR: %v", err)
 			err = nil
 
 			//deleteVhostPort(sock_name, bridge_name)
@@ -159,7 +159,7 @@ func findBridge(bridge_name string) bool {
 	name, err := execCommand(cmd, args)
 	logging.Verbosef("ovsctl.findBridge(): return  name=%v err=%v", name, err)
 	if err == nil {
-		if name != nil && len(name) != 0 {
+		if len(name) != 0 {
 			found = true
 		}
 	}
@@ -177,7 +177,7 @@ func doesBridgeContainInterfaces(bridge_name string) bool {
 	name, err := execCommand(cmd, args)
 	logging.Verbosef("ovsctl.doesBridgeContainInterfaces(): return  name=%v err=%v", name, err)
 	if err == nil {
-		if name != nil && len(name) != 0 {
+		if len(name) != 0 {
 			found = true
 		}
 	}
diff --git a/cniovs/ovsctrl_test.go b/cniovs/ovsctrl_test.go
index e8fd5270..471ee741 100644
--- a/cniovs/ovsctrl_test.go
+++ b/cniovs/ovsctrl_test.go
@@ -17,7 +17,6 @@ package cniovs
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"strings"
@@ -77,7 +76,7 @@ func TestCreateVhostPort(t *testing.T) {
 			require := require.New(t)
 			execCommand := &FakeExecCommand{Err: tc.fakeErr}
 
-			socketDir, dirErr := ioutil.TempDir("/tmp", "test-cniovs-")
+			socketDir, dirErr := os.MkdirTemp("/tmp", "test-cniovs-")
 			require.NoError(dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(socketDir)
 
diff --git a/cnivpp/api/bridge/bridge.go b/cnivpp/api/bridge/bridge.go
index 62d8458c..683176ae 100644
--- a/cnivpp/api/bridge/bridge.go
+++ b/cnivpp/api/bridge/bridge.go
@@ -17,18 +17,18 @@
 package vppbridge
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
 
-	"git.fd.io/govpp.git/api"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/l2"
+	. "github.com/intel/userspace-cni-network-plugin/pkg/types"
+	"go.fd.io/govpp/api"
 )
 
-//
 // Constants
-//
 const debugBridge = false
 
 //
@@ -49,14 +49,14 @@ func CreateBridge(ch api.Channel, bridgeDomain uint32) error {
 	// Populate the Request Structure
 	req := &l2.BridgeDomainAddDel{
 		BdID:    bridgeDomain,
-		Flood:   1,
-		UuFlood: 1,
-		Forward: 1,
-		Learn:   1,
-		ArpTerm: 0,
+		Flood:   true,
+		UuFlood: true,
+		Forward: true,
+		Learn:   true,
+		ArpTerm: false,
 		MacAge:  0,
 		//BdTag   []byte `struc:"[64]byte"`
-		IsAdd: 1,
+		IsAdd: true,
 	}
 
 	reply := &l2.BridgeDomainAddDelReply{}
@@ -78,14 +78,14 @@ func DeleteBridge(ch api.Channel, bridgeDomain uint32) error {
 
 	// Determine if bridge domain exists
 	exists, count := findBridge(ch, bridgeDomain)
-	if exists == false || count != 0 {
+	if !exists || count != 0 {
 		return nil
 	}
 
 	// Populate the Request Structure
 	req := &l2.BridgeDomainAddDel{
 		BdID:  bridgeDomain,
-		IsAdd: 0,
+		IsAdd: false,
 	}
 
 	reply := &l2.BridgeDomainAddDelReply{}
@@ -103,7 +103,7 @@ func DeleteBridge(ch api.Channel, bridgeDomain uint32) error {
 }
 
 // Attempt to add an interface to a Bridge Domain.
-func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId uint32) error {
+func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId interface_types.InterfaceIndex) error {
 	var err error
 
 	// Determine if bridge domain exists, and if not, create it. CreateBridge()
@@ -119,7 +119,7 @@ func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId uint32) erro
 		RxSwIfIndex: swIfId,
 		Shg:         0,
 		PortType:    l2.L2_API_PORT_TYPE_NORMAL,
-		Enable:      1,
+		Enable:      true,
 	}
 
 	reply := &l2.SwInterfaceSetL2BridgeReply{}
@@ -137,7 +137,7 @@ func AddBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId uint32) erro
 }
 
 // Attempt to remove an interface from a Bridge Domain.
-func RemoveBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId uint32) error {
+func RemoveBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId interface_types.InterfaceIndex) error {
 
 	// Populate the Request Structure
 	req := &l2.SwInterfaceSetL2Bridge{
@@ -145,7 +145,7 @@ func RemoveBridgeInterface(ch api.Channel, bridgeDomain uint32, swIfId uint32) e
 		RxSwIfIndex: swIfId,
 		Shg:         0,
 		PortType:    l2.L2_API_PORT_TYPE_NORMAL,
-		Enable:      0,
+		Enable:      false,
 	}
 
 	reply := &l2.SwInterfaceSetL2BridgeReply{}
@@ -175,7 +175,7 @@ func DumpBridge(ch api.Channel, bridgeDomain uint32) {
 
 	// Populate the Message Structure
 	req := &l2.BridgeDomainDump{
-		BdID: bridgeDomain,
+		BdID: bridgeDomain, SwIfIndex: DefaultSwIfIndex,
 	}
 
 	reply := &l2.BridgeDomainDetails{}
@@ -183,7 +183,7 @@ func DumpBridge(ch api.Channel, bridgeDomain uint32) {
 	err := ch.SendRequest(req).ReceiveReply(reply)
 
 	if err == nil {
-		fmt.Printf("    Bridge Domain %d: Fld=%d UuFld=%d Fwd=%d Lrn=%d Arp=%d Mac=%d Bvi=%d NSwId=%d BdTag=%s\n",
+		fmt.Printf("    Bridge Domain %v: Fld=%v UuFld=%v Fwd=%v Lrn=%v Arp=%v Mac=%d Bvi=%d NSwId=%d BdTag=%s\n",
 			bridgeDomain,
 			reply.Flood,
 			reply.UuFlood,
@@ -213,14 +213,15 @@ func DumpBridge(ch api.Channel, bridgeDomain uint32) {
 
 // Determine if the input Bridge exists.
 // Return: true - Exists  false - otherwise
-//         uint32 - Number of associated interfaces
+//
+//	uint32 - Number of associated interfaces
 func findBridge(ch api.Channel, bridgeDomain uint32) (bool, uint32) {
 	var rval bool = false
 	var count uint32
 
 	// Populate the Message Structure
 	req := &l2.BridgeDomainDump{
-		BdID: bridgeDomain,
+		BdID: bridgeDomain, SwIfIndex: DefaultSwIfIndex,
 	}
 	reqCtx := ch.SendMultiRequest(req)
 
diff --git a/cnivpp/api/infra/infra.go b/cnivpp/api/infra/infra.go
index c21a0301..1525c8dc 100644
--- a/cnivpp/api/infra/infra.go
+++ b/cnivpp/api/infra/infra.go
@@ -17,16 +17,16 @@
 package vppinfra
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
 
 	"github.com/sirupsen/logrus"
 
-	"git.fd.io/govpp.git"
-	"git.fd.io/govpp.git/api"
-	"git.fd.io/govpp.git/core"
+	"go.fd.io/govpp"
+	"go.fd.io/govpp/api"
+	"go.fd.io/govpp/core"
 )
 
 //
diff --git a/cnivpp/api/interface/interface.go b/cnivpp/api/interface/interface.go
index 28711eb6..2c671be9 100644
--- a/cnivpp/api/interface/interface.go
+++ b/cnivpp/api/interface/interface.go
@@ -17,20 +17,19 @@
 package vppinterface
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
 
-	"github.com/containernetworking/cni/pkg/types/current"
-
-	"git.fd.io/govpp.git/api"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interfaces"
+	current "github.com/containernetworking/cni/pkg/types/100"
+	interfaces "github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/ip_types"
+	"go.fd.io/govpp/api"
 )
 
-//
 // Constants
-//
 const debugInterface = false
 
 //
@@ -38,12 +37,12 @@ const debugInterface = false
 //
 
 // Attempt to set an interface state. isUp (1 = up, 0 = down)
-func SetState(ch api.Channel, swIfIndex uint32, isUp uint8) error {
+func SetState(ch api.Channel, swIfIndex interface_types.InterfaceIndex, isUp interface_types.IfStatusFlags) error {
 	// Populate the Add Structure
 	req := &interfaces.SwInterfaceSetFlags{
 		SwIfIndex: swIfIndex,
 		// 1 = up, 0 = down
-		AdminUpDown: isUp,
+		Flags: isUp,
 	}
 
 	reply := &interfaces.SwInterfaceSetFlagsReply{}
@@ -60,30 +59,30 @@ func SetState(ch api.Channel, swIfIndex uint32, isUp uint8) error {
 	return nil
 }
 
-func AddDelIpAddress(ch api.Channel, swIfIndex uint32, isAdd uint8, ipResult *current.Result) error {
+func AddDelIpAddress(ch api.Channel, swIfIndex interface_types.InterfaceIndex, isAdd bool, ipResult *current.Result) error {
 
 	// Populate the Add Structure
 	req := &interfaces.SwInterfaceAddDelAddress{
 		SwIfIndex: swIfIndex,
 		IsAdd:     isAdd, // 1 = add, 0 = delete
-		DelAll:    0,
+		DelAll:    false,
 	}
-
 	for _, ip := range ipResult.IPs {
-		if ip.Version == "4" {
-			req.IsIPv6 = 0
-			req.Address = []byte(ip.Address.IP.To4())
-			prefix, _ := ip.Address.Mask.Size()
-			req.AddressLength = byte(prefix)
-		} else if ip.Version == "6" {
-			req.IsIPv6 = 1
-			req.Address = []byte(ip.Address.IP.To16())
-			prefix, _ := ip.Address.Mask.Size()
-			req.AddressLength = byte(prefix)
+		var addressWithPrefix ip_types.AddressWithPrefix
+
+		if prefix, _ := ip.Address.Mask.Size(); prefix == 4 {
+			addressWithPrefix = ip_types.AddressWithPrefix{Address: ip_types.AddressFromIP(ip.Address.IP.To4()), Len: 4}
+
+		} else if prefix, _ := ip.Address.Mask.Size(); prefix == 16 {
+			addressWithPrefix = ip_types.AddressWithPrefix{Address: ip_types.AddressFromIP(ip.Address.IP.To16()), Len: 16}
+		} else {
+			break
 		}
+		fmt.Println(addressWithPrefix)
+		req.Prefix = addressWithPrefix
 
 		// Only one address is currently supported.
-		if req.AddressLength != 0 {
+		if req.Prefix.Len != 0 {
 			break
 		}
 	}
diff --git a/cnivpp/api/memif/memif.go b/cnivpp/api/memif/memif.go
index aee9f63a..75610553 100644
--- a/cnivpp/api/memif/memif.go
+++ b/cnivpp/api/memif/memif.go
@@ -17,16 +17,18 @@
 package vppmemif
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
-	"net"
+	// "net"
+
 	"os"
 	"path/filepath"
 
-	"git.fd.io/govpp.git/api"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
+	"go.fd.io/govpp/api"
 
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
 	"github.com/intel/userspace-cni-network-plugin/logging"
 )
 
@@ -36,14 +38,14 @@ import (
 
 const debugMemif = false
 
-type MemifRole uint8
+type MemifRole uint32
 
 const (
 	RoleMaster MemifRole = 0
 	RoleSlave  MemifRole = 1
 )
 
-type MemifMode uint8
+type MemifMode uint32
 
 const (
 	ModeEthernet   MemifMode = 0
@@ -54,7 +56,6 @@ const (
 // Dump Strings
 var modeStr = [...]string{"eth", "ip ", "pnt"}
 var roleStr = [...]string{"master", "slave "}
-var stateStr = [...]string{"dn", "up"}
 
 //
 // API Functions
@@ -62,15 +63,16 @@ var stateStr = [...]string{"dn", "up"}
 
 // Attempt to create a MemIf Interface.
 // Input:
-//   ch api.Channel
-//   socketId uint32
-//   role MemifRole - RoleMaster or RoleSlave
-func CreateMemifInterface(ch api.Channel, socketId uint32, role MemifRole, mode MemifMode) (swIfIndex uint32, err error) {
+//
+//	ch api.Channel
+//	socketId uint32
+//	role MemifRole - RoleMaster or RoleSlave
+func CreateMemifInterface(ch api.Channel, socketId uint32, role memif.MemifRole, mode memif.MemifMode) (swIfIndex interface_types.InterfaceIndex, err error) {
 
 	// Populate the Add Structure
 	req := &memif.MemifCreate{
-		Role:     uint8(role),
-		Mode:     uint8(mode),
+		Role:     role,
+		Mode:     mode,
 		RxQueues: 1,
 		TxQueues: 1,
 		ID:       0,
@@ -91,7 +93,7 @@ func CreateMemifInterface(ch api.Channel, socketId uint32, role MemifRole, mode
 		}
 		return
 	} else {
-		swIfIndex = reply.SwIfIndex
+		swIfIndex = interface_types.InterfaceIndex(reply.SwIfIndex)
 	}
 
 	return
@@ -100,12 +102,12 @@ func CreateMemifInterface(ch api.Channel, socketId uint32, role MemifRole, mode
 // Attempt to delete a memif interface. If the deleted MemIf Interface
 // is the last interface associated with a socketfile, this function
 // will attempt to delete it.
-func DeleteMemifInterface(ch api.Channel, swIfIndex uint32) (err error) {
+func DeleteMemifInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (err error) {
 
 	// Determine if memif interface exists
 	socketId, exist := findMemifInterface(ch, swIfIndex)
 	if debugMemif {
-		if exist == false {
+		if !exist {
 			logging.Verbosef("Error deleting memif interface: memif interface (swIfIndex=%d) Does NOT Exist", swIfIndex)
 		} else {
 			logging.Verbosef("Attempting to delete memif interface %d with SocketId %d", swIfIndex, socketId)
@@ -169,19 +171,17 @@ func DumpMemif(ch api.Channel) {
 		}
 		//logging.Verbosef("%+v", reply)
 
-		macAddr := net.HardwareAddr(reply.HwAddr)
-		logging.Verbosef("    SwIfId=%d ID=%d Socket=%d Role=%s Mode=%s IfName=%s HwAddr=%s RingSz=%d BufferSz=%d Admin=%s Link=%s",
+		macAddr := reply.HwAddr
+		logging.Verbosef("    SwIfId=%d ID=%d Socket=%d Role=%s Mode=%s IfName=%s HwAddr=%v RingSz=%d ",
 			reply.SwIfIndex,
 			reply.ID,
 			reply.SocketID,
 			roleStr[reply.Role],
 			modeStr[reply.Mode],
 			string(reply.IfName),
-			macAddr.String(),
+			macAddr,
 			reply.RingSize,
-			reply.BufferSize,
-			stateStr[reply.AdminUpDown],
-			stateStr[reply.LinkUpDown])
+		)
 
 		count++
 	}
@@ -224,9 +224,9 @@ func CreateMemifSocket(ch api.Channel, socketFile string) (socketId uint32, err
 
 	// Populate the Request Structure
 	req := &memif.MemifSocketFilenameAddDel{
-		IsAdd:          1,
+		IsAdd:          true,
 		SocketID:       socketId,
-		SocketFilename: []byte(socketFile),
+		SocketFilename: socketFile,
 	}
 
 	reply := &memif.MemifSocketFilenameAddDelReply{}
@@ -248,7 +248,7 @@ func CreateMemifSocket(ch api.Channel, socketFile string) (socketId uint32, err
 func DeleteMemifSocket(ch api.Channel, socketId uint32) (err error) {
 	// Populate the Add Structure
 	req := &memif.MemifSocketFilenameAddDel{
-		IsAdd:    0,
+		IsAdd:    false,
 		SocketID: socketId,
 	}
 
@@ -301,7 +301,7 @@ func DumpMemifSocket(ch api.Channel) {
 //
 
 // Find the given memif interface and return socketId if it exists
-func findMemifInterface(ch api.Channel, swIfIndex uint32) (socketId uint32, found bool) {
+func findMemifInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (socketId uint32, found bool) {
 
 	// Populate the Message Structure
 	req := &memif.MemifDump{}
@@ -380,9 +380,10 @@ func findMemifSocketCnt(ch api.Channel, socketId uint32) (count uint32) {
 // socketFile exists. If it does, return the associated socketId.
 // If it doesn't, return the next available socketId.
 // Returns:
-//   bool - Found flag
-//   uint32 - If found is true: associated socketId.
-//            If found is false: next free socketId.
+//
+//	bool - Found flag
+//	uint32 - If found is true: associated socketId.
+//	         If found is false: next free socketId.
 func findMemifSocket(ch api.Channel, socketFilename string) (found bool, socketId uint32) {
 
 	var count int
@@ -423,10 +424,10 @@ func findMemifSocket(ch api.Channel, socketFilename string) (found bool, socketI
 	// If input SocketFilename has not been created, then loop
 	// through the list of existing SocketIds and find an unused Id.
 	//
-	if found == false {
+	if !found {
 		socketId = 1
 
-		for done == false {
+		for !done {
 
 			done = true
 			for i := 0; i < count; i++ {
diff --git a/cnivpp/api/vhostuser/vhostuser.go b/cnivpp/api/vhostuser/vhostuser.go
index c1aafccd..b59fe86e 100644
--- a/cnivpp/api/vhostuser/vhostuser.go
+++ b/cnivpp/api/vhostuser/vhostuser.go
@@ -17,13 +17,14 @@
 package vppvhostuser
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
 
-	"git.fd.io/govpp.git/api"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/vhost_user"
+	"go.fd.io/govpp/api"
 )
 
 //
@@ -32,34 +33,32 @@ import (
 
 const debugVhost = false
 
-type VhostUserMode uint8
+type VhostUserMode bool
 
 const (
-	ModeClient VhostUserMode = 0
-	ModeServer VhostUserMode = 1
+	ModeClient VhostUserMode = false
+	ModeServer VhostUserMode = true
 )
 
-// Dump Strings
-var modeStr = [...]string{"client", "server"}
-
 //
 // API Functions
 //
 
 // Attempt to create a Vhost-User Interface.
 // Input:
-//   ch api.Channel
-//   mode VhostUserMode - ModeClient or ModeServer
-//   socketFile string - Directory and Filename of socket file
-func CreateVhostUserInterface(ch api.Channel, mode VhostUserMode, socketFile string) (swIfIndex uint32, err error) {
+//
+//	ch api.Channel
+//	mode VhostUserMode - ModeClient or ModeServer
+//	socketFile string - Directory and Filename of socket file
+func CreateVhostUserInterface(ch api.Channel, mode bool, socketFile string) (swIfIndex interface_types.InterfaceIndex, err error) {
 
 	// Populate the Add Structure
 	req := &vhost_user.CreateVhostUserIf{
-		IsServer:          uint8(mode),
-		SockFilename:      []byte(socketFile),
-		Renumber:          0,
+		IsServer:          mode,
+		SockFilename:      socketFile,
+		Renumber:          false,
 		CustomDevInstance: 0,
-		UseCustomMac:      0,
+		UseCustomMac:      false,
 		//MacAddress: "",
 		//Tag: "",
 	}
@@ -81,7 +80,7 @@ func CreateVhostUserInterface(ch api.Channel, mode VhostUserMode, socketFile str
 }
 
 // Attempt to delete a Vhost-User interface.
-func DeleteVhostUserInterface(ch api.Channel, swIfIndex uint32) (err error) {
+func DeleteVhostUserInterface(ch api.Channel, swIfIndex interface_types.InterfaceIndex) (err error) {
 
 	// Populate the Delete Structure
 	req := &vhost_user.DeleteVhostUserIf{
@@ -122,13 +121,14 @@ func DumpVhostUser(ch api.Channel) {
 		}
 		//fmt.Printf("%+v\n", reply)
 
-		fmt.Printf("    SwIfId=%d Mode=%s IfName=%s NumReg=%d SockErrno=%d Feature=0x16%x HdrSz=%d SockFile=%s\n",
+		fmt.Printf("    SwIfId=%d Mode=%t IfName=%s NumReg=%d SockErrno=%d FeaturesFirst32=%d FeaturesLast32=%d HdrSz=%d SockFile=%s\n",
 			reply.SwIfIndex,
-			modeStr[reply.IsServer],
+			reply.IsServer,
 			string(reply.InterfaceName),
 			reply.NumRegions,
 			reply.SockErrno,
-			reply.Features,
+			reply.FeaturesFirst32,
+			reply.FeaturesLast32,
 			reply.VirtioNetHdrSz,
 			string(reply.SockFilename))
 
diff --git a/cnivpp/cnivpp.go b/cnivpp/cnivpp.go
index 0e72f219..f28964c4 100644
--- a/cnivpp/cnivpp.go
+++ b/cnivpp/cnivpp.go
@@ -35,39 +35,35 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types/current"
-
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	current "github.com/containernetworking/cni/pkg/types/100"
+
+	vppbridge "github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
+	vppinfra "github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
+	vppinterface "github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
+	vppmemif "github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
 	"github.com/intel/userspace-cni-network-plugin/logging"
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )
 
-//
 // Constants
-//
 const (
 	dbgBridge    = false
 	dbgInterface = false
 )
 
-//
 // Types
-//
 type CniVpp struct {
 }
 
-//
 // API Functions
-//
 func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
-							   args *skel.CmdArgs,
-							   kubeClient kubernetes.Interface,
-							   sharedDir string,
-							   ipResult *current.Result) error {
+	args *skel.CmdArgs,
+	kubeClient kubernetes.Interface,
+	sharedDir string,
+	ipResult *current.Result) error {
 	var vppCh vppinfra.ConnectionData
 	var err error
 	var data VppSavedData
@@ -97,7 +93,7 @@ func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
 	//
 	// Set interface to up (1)
 	//
-	err = vppinterface.SetState(vppCh.Ch, data.SwIfIndex, 1)
+	err = vppinterface.SetState(vppCh.Ch, data.InterfaceSwIfIndex, 1)
 	if err != nil {
 		logging.Debugf("AddOnHost(vpp): Error bringing interface UP: %v", err)
 		return err
@@ -130,20 +126,20 @@ func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
 
 		// Add Interface to Bridge. If Bridge does not exist, AddBridgeInterface()
 		// will create.
-		err = vppbridge.AddBridgeInterface(vppCh.Ch, bridgeDomain, data.SwIfIndex)
+		err = vppbridge.AddBridgeInterface(vppCh.Ch, bridgeDomain, interface_types.InterfaceIndex(data.InterfaceSwIfIndex))
 		if err != nil {
 			logging.Debugf("AddOnHost(vpp): Error adding interface to bridge: %v", err)
 			return err
 		} else {
 			if dbgBridge {
-				logging.Debugf("INTERFACE %d added to BRIDGE %d\n", data.SwIfIndex, bridgeDomain)
+				logging.Debugf("INTERFACE %d added to BRIDGE %d\n", data.InterfaceSwIfIndex, bridgeDomain)
 				vppbridge.DumpBridge(vppCh.Ch, bridgeDomain)
 			}
 		}
-	// Add L3 Network if supplied
+		// Add L3 Network if supplied
 	} else if conf.HostConf.NetType == "interface" {
 		if ipResult != nil && len(ipResult.IPs) != 0 {
-			err = vppinterface.AddDelIpAddress(vppCh.Ch, data.SwIfIndex, 1, ipResult)
+			err = vppinterface.AddDelIpAddress(vppCh.Ch, data.InterfaceSwIfIndex, true, ipResult)
 			if err != nil {
 				logging.Debugf("AddOnHost(vpp): Error adding IP: %v", err)
 				return err
@@ -155,7 +151,6 @@ func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
 		return err
 	}
 
-
 	//
 	// Save Create Data for Delete
 	//
@@ -169,11 +164,11 @@ func (cniVpp CniVpp) AddOnHost(conf *types.NetConf,
 }
 
 func (cniVpp CniVpp) AddOnContainer(conf *types.NetConf,
-									args *skel.CmdArgs,
-									kubeClient kubernetes.Interface,
-									sharedDir string,
-									pod *v1.Pod,
-									ipResult *current.Result) (*v1.Pod, error) {
+	args *skel.CmdArgs,
+	kubeClient kubernetes.Interface,
+	sharedDir string,
+	pod *v1.Pod,
+	ipResult *current.Result) (*v1.Pod, error) {
 	logging.Infof("VPP AddOnContainer: ENTER - Container %s Iface %s", args.ContainerID[:12], args.IfName)
 	return configdata.SaveRemoteConfig(conf, args, kubeClient, sharedDir, pod, ipResult)
 }
@@ -208,19 +203,19 @@ func (cniVpp CniVpp) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
 		var bridgeDomain uint32 = uint32(conf.HostConf.BridgeConf.BridgeId)
 
 		if dbgBridge {
-			logging.Verbosef("INTERFACE %d retrieved from CONF - attempt to DELETE Bridge %d\n", data.SwIfIndex, bridgeDomain)
+			logging.Verbosef("INTERFACE %d retrieved from CONF - attempt to DELETE Bridge %d\n", data.InterfaceSwIfIndex, bridgeDomain)
 		}
 
 		// Remove MemIf from Bridge. RemoveBridgeInterface() will delete Bridge if
 		// no more interfaces are associated with the Bridge.
-		err = vppbridge.RemoveBridgeInterface(vppCh.Ch, bridgeDomain, data.SwIfIndex)
+		err = vppbridge.RemoveBridgeInterface(vppCh.Ch, bridgeDomain, interface_types.InterfaceIndex(data.InterfaceSwIfIndex))
 
 		if err != nil {
 			logging.Debugf("DelFromHost(vpp): Error removing interface from bridge: %v", err)
 			return err
 		} else {
 			if dbgBridge {
-				logging.Verbosef("INTERFACE %d removed from BRIDGE %d\n", data.SwIfIndex, bridgeDomain)
+				logging.Verbosef("INTERFACE %d removed from BRIDGE %d\n", data.InterfaceSwIfIndex, bridgeDomain)
 				vppbridge.DumpBridge(vppCh.Ch, bridgeDomain)
 			}
 		}
@@ -236,25 +231,21 @@ func (cniVpp CniVpp) DelFromHost(conf *types.NetConf, args *skel.CmdArgs, shared
 	} else {
 		return fmt.Errorf("ERROR: Unknown HostConf.Type:" + conf.HostConf.IfType)
 	}
-
-	return err
 }
 
 func (cniVpp CniVpp) DelFromContainer(conf *types.NetConf, args *skel.CmdArgs, sharedDir string, pod *v1.Pod) error {
 	logging.Infof("VPP DelFromContainer: ENTER - Container %s Iface %s", args.ContainerID[:12], args.IfName)
 
-	configdata.FileCleanup(sharedDir, "")
+	_ = configdata.FileCleanup(sharedDir, "")
 
 	return nil
 }
 
-//
 // Local Functions
-//
 func getMemifSocketfileName(conf *types.NetConf,
-			sharedDir string,
-			containerID string,
-			ifName string) (string) {
+	sharedDir string,
+	containerID string,
+	ifName string) string {
 	if conf.HostConf.MemifConf.Socketfile == "" {
 		conf.HostConf.MemifConf.Socketfile = fmt.Sprintf("memif-%s-%s.sock", containerID[:12], ifName)
 	}
@@ -262,10 +253,10 @@ func getMemifSocketfileName(conf *types.NetConf,
 }
 
 func addLocalDeviceMemif(vppCh vppinfra.ConnectionData,
-						 conf *types.NetConf,
-						 args *skel.CmdArgs,
-						 sharedDir string,
-						 data *VppSavedData) (err error) {
+	conf *types.NetConf,
+	args *skel.CmdArgs,
+	sharedDir string,
+	data *VppSavedData) (err error) {
 	// Validate and convert input data
 	var memifRole vppmemif.MemifRole
 	var memifMode vppmemif.MemifMode
@@ -302,19 +293,19 @@ func addLocalDeviceMemif(vppCh vppinfra.ConnectionData,
 		return
 	} else {
 		if dbgInterface {
-			logging.Verbosef("MEMIF SOCKET", data.MemifSocketId, memifSocketPath, "created")
+			logging.Verbosef("MEMIF SOCKET %d %s %s", data.MemifSocketId, memifSocketPath, "created")
 			vppmemif.DumpMemifSocket(vppCh.Ch)
 		}
 	}
 
 	// Create MemIf Interface
-	data.SwIfIndex, err = vppmemif.CreateMemifInterface(vppCh.Ch, data.MemifSocketId, memifRole, memifMode)
+	data.InterfaceSwIfIndex, err = vppmemif.CreateMemifInterface(vppCh.Ch, data.MemifSocketId, memif.MemifRole(memifRole), memif.MemifMode(memifMode))
 	if err != nil {
 		logging.Debugf("addLocalDeviceMemif(vpp): Error creating memif inteface: %v", err)
 		return
 	} else {
 		if dbgInterface {
-			logging.Verbosef("MEMIF", data.SwIfIndex, "created", args.IfName)
+			logging.Verbosef("MEMIF %d %s %s ", data.InterfaceSwIfIndex, "created", args.IfName)
 			vppmemif.DumpMemif(vppCh.Ch)
 		}
 	}
@@ -327,13 +318,13 @@ func delLocalDeviceMemif(vppCh vppinfra.ConnectionData, conf *types.NetConf, arg
 	memifSocketPath := getMemifSocketfileName(conf, sharedDir, args.ContainerID, args.IfName)
 
 	// Delete the memif interface
-	err = vppmemif.DeleteMemifInterface(vppCh.Ch, data.SwIfIndex)
+	err = vppmemif.DeleteMemifInterface(vppCh.Ch, interface_types.InterfaceIndex(data.InterfaceSwIfIndex))
 	if err != nil {
 		logging.Debugf("delLocalDeviceMemif(vpp): Error deleting memif inteface: %v", err)
 		return
 	} else {
 		if dbgInterface {
-			logging.Verbosef("INTERFACE %d deleted\n", data.SwIfIndex)
+			logging.Verbosef("INTERFACE %d deleted\n", data.InterfaceSwIfIndex)
 			vppmemif.DumpMemif(vppCh.Ch)
 			vppmemif.DumpMemifSocket(vppCh.Ch)
 		}
diff --git a/cnivpp/localdb.go b/cnivpp/localdb.go
index 6e4bd9b6..85564fc8 100644
--- a/cnivpp/localdb.go
+++ b/cnivpp/localdb.go
@@ -28,20 +28,18 @@ package cnivpp
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"github.com/containernetworking/cni/pkg/skel"
 
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 	"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )
 
-//
 // Constants
-//
 const debugVppDb = false
 
 //
@@ -51,8 +49,8 @@ const debugVppDb = false
 // This structure is a union of all the VPP data (for all types of
 // interfaces) that need to be preserved for later use.
 type VppSavedData struct {
-	SwIfIndex     uint32 `json:"swIfIndex"`     // Software Index, used to access the created interface, needed to delete interface.
-	MemifSocketId uint32 `json:"memifSocketId"` // Memif SocketId, used to access the created memif Socket File, used for debug only.
+	InterfaceSwIfIndex interface_types.InterfaceIndex `json:"swIfIndex"`     // Software Index, used to access the created interface, needed to delete interface.
+	MemifSocketId      uint32                         `json:"memifSocketId"` // Memif SocketId, used to access the created memif Socket File, used for debug only.
 }
 
 //
@@ -60,7 +58,8 @@ type VppSavedData struct {
 //
 
 // saveVppConfig() - Some data needs to be saved, like the swIfIndex, for cmdDel().
-//  This function squirrels the data away to be retrieved later.
+//
+//	This function squirrels the data away to be retrieved later.
 func SaveVppConfig(conf *types.NetConf, args *skel.CmdArgs, data *VppSavedData) error {
 
 	// Current implementation is to write data to a file with the name:
@@ -83,9 +82,9 @@ func SaveVppConfig(conf *types.NetConf, args *skel.CmdArgs, data *VppSavedData)
 		path := filepath.Join(localDir, fileName)
 
 		if debugVppDb {
-			fmt.Printf("SAVE FILE: swIfIndex=%d path=%s dataBytes=%s\n", data.SwIfIndex, path, dataBytes)
+			fmt.Printf("SAVE FILE: swIfIndex=%d path=%s dataBytes=%s\n", data.InterfaceSwIfIndex, path, dataBytes)
 		}
-		return ioutil.WriteFile(path, dataBytes, 0644)
+		return os.WriteFile(path, dataBytes, 0644)
 	} else {
 		return fmt.Errorf("ERROR: serializing delegate VPP saved data: %v", err)
 	}
@@ -98,7 +97,7 @@ func LoadVppConfig(conf *types.NetConf, args *skel.CmdArgs, data *VppSavedData)
 	path := filepath.Join(localDir, fileName)
 
 	if _, err := os.Stat(path); err == nil {
-		if dataBytes, err := ioutil.ReadFile(path); err == nil {
+		if dataBytes, err := os.ReadFile(path); err == nil {
 			if err = json.Unmarshal(dataBytes, data); err != nil {
 				return fmt.Errorf("ERROR: Failed to parse VPP saved data: %v", err)
 			}
@@ -111,7 +110,7 @@ func LoadVppConfig(conf *types.NetConf, args *skel.CmdArgs, data *VppSavedData)
 	}
 
 	// Delete file (and directory if empty)
-	configdata.FileCleanup(localDir, path)
+	_ = configdata.FileCleanup(localDir, path)
 
 	return nil
 }
diff --git a/cnivpp/test/ipAddDel/ipAddDel.go b/cnivpp/test/ipAddDel/ipAddDel.go
index 4d4e0f75..999df268 100644
--- a/cnivpp/test/ipAddDel/ipAddDel.go
+++ b/cnivpp/test/ipAddDel/ipAddDel.go
@@ -26,26 +26,24 @@ import (
 	"runtime"
 	"time"
 
-	_ "git.fd.io/govpp.git/core"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 	_ "github.com/sirupsen/logrus"
+	_ "go.fd.io/govpp/core"
 
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	vppinfra "github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
+	vppinterface "github.com/intel/userspace-cni-network-plugin/cnivpp/api/interface"
+	vppmemif "github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
 )
 
-//
 // Constants
-//
 const (
 	dbgIp    = true
 	dbgMemif = true
 )
 
-//
 // Functions
-//
 func init() {
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -56,15 +54,15 @@ func init() {
 func main() {
 	var vppCh vppinfra.ConnectionData
 	var err error
-	var swIfIndex uint32
+	var swIfIndex interface_types.InterfaceIndex
 
 	// Dummy Input Data
 	var ipString string = "192.168.172.100/24"
 	var ipResult *current.Result
 	var memifSocketId uint32
 	var memifSocketFile string = "/var/run/vpp/123456/memif-3.sock"
-	var memifRole vppmemif.MemifRole = vppmemif.RoleMaster
-	var memifMode vppmemif.MemifMode = vppmemif.ModeEthernet
+	var memifRole memif.MemifRole = 0
+	var memifMode memif.MemifMode = 0
 
 	// Set log level
 	//   Logrus has six logging levels: DebugLevel, InfoLevel, WarningLevel, ErrorLevel, FatalLevel and PanicLevel.
@@ -112,7 +110,7 @@ func main() {
 	}
 
 	// Add IP to MemIf to Bridge.
-	err = vppinterface.AddDelIpAddress(vppCh.Ch, swIfIndex, 1, ipResult)
+	err = vppinterface.AddDelIpAddress(vppCh.Ch, swIfIndex, true, ipResult)
 	if err != nil {
 		fmt.Println("Error:", err)
 		os.Exit(1)
@@ -125,7 +123,7 @@ func main() {
 	fmt.Println("User Space VPP client wakeup.")
 
 	// Remove IP from MemIf.
-	err = vppinterface.AddDelIpAddress(vppCh.Ch, swIfIndex, 0, ipResult)
+	err = vppinterface.AddDelIpAddress(vppCh.Ch, swIfIndex, false, ipResult)
 
 	if err != nil {
 		fmt.Println("Error:", err)
diff --git a/cnivpp/test/memifAddDel/memifAddDel.go b/cnivpp/test/memifAddDel/memifAddDel.go
index dbae842a..a77d407b 100644
--- a/cnivpp/test/memifAddDel/memifAddDel.go
+++ b/cnivpp/test/memifAddDel/memifAddDel.go
@@ -17,7 +17,7 @@
 package main
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
@@ -26,25 +26,23 @@ import (
 	"runtime"
 	"time"
 
-	_ "git.fd.io/govpp.git/core"
 	_ "github.com/sirupsen/logrus"
+	_ "go.fd.io/govpp/core"
 
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
-	"github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	vppbridge "github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
+	vppinfra "github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
+	vppmemif "github.com/intel/userspace-cni-network-plugin/cnivpp/api/memif"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/memif"
 )
 
-//
 // Constants
-//
 const (
 	dbgBridge = true
 	dbgMemif  = true
 )
 
-//
 // Functions
-//
 func init() {
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -55,14 +53,14 @@ func init() {
 func main() {
 	var vppCh vppinfra.ConnectionData
 	var err error
-	var swIfIndex uint32
+	var swIfIndex interface_types.InterfaceIndex
 
 	// Dummy Input Data
 	var bridgeDomain uint32 = 4
 	var memifSocketId uint32
 	var memifSocketFile string = "/var/run/vpp/123456/memif-3.sock"
-	var memifRole vppmemif.MemifRole = vppmemif.RoleMaster
-	var memifMode vppmemif.MemifMode = vppmemif.ModeEthernet
+	var memifRole memif.MemifRole = 0
+	var memifMode memif.MemifMode = 0
 
 	// Set log level
 	//   Logrus has six logging levels: DebugLevel, InfoLevel, WarningLevel, ErrorLevel, FatalLevel and PanicLevel.
diff --git a/cnivpp/test/vhostUserAddDel/vhostUserAddDel.go b/cnivpp/test/vhostUserAddDel/vhostUserAddDel.go
index 652272b6..4d955cab 100644
--- a/cnivpp/test/vhostUserAddDel/vhostUserAddDel.go
+++ b/cnivpp/test/vhostUserAddDel/vhostUserAddDel.go
@@ -17,7 +17,7 @@
 package main
 
 // Generates Go bindings for all VPP APIs located in the json directory.
-//go:generate go run git.fd.io/govpp.git/cmd/binapi-generator --output-dir=../../bin_api
+//go:generate go run go.fd.io/govpp/cmd/binapi-generator --output-dir=../../bin_api
 
 import (
 	"fmt"
@@ -26,25 +26,22 @@ import (
 	"runtime"
 	"time"
 
-	_ "git.fd.io/govpp.git/core"
 	_ "github.com/sirupsen/logrus"
+	_ "go.fd.io/govpp/core"
 
 	vppbridge "github.com/intel/userspace-cni-network-plugin/cnivpp/api/bridge"
 	vppinfra "github.com/intel/userspace-cni-network-plugin/cnivpp/api/infra"
 	vppvhostuser "github.com/intel/userspace-cni-network-plugin/cnivpp/api/vhostuser"
+	"github.com/intel/userspace-cni-network-plugin/cnivpp/bin_api/interface_types"
 )
 
-//
 // Constants
-//
 const (
 	dbgBridge    = true
 	dbgVhostUser = true
 )
 
-//
 // Functions
-//
 func init() {
 	// this ensures that main runs only on main thread (thread group leader).
 	// since namespace ops (unshare, setns) are done for a single thread, we
@@ -55,13 +52,12 @@ func init() {
 func main() {
 	var vppCh vppinfra.ConnectionData
 	var err error
-	var swIfIndex uint32
+	var swIfIndex interface_types.InterfaceIndex
 
 	// Dummy Input Data
 	var bridgeDomain uint32 = 4
 	var vhostUserSocketFile string = "/var/run/vpp/123456/vhost3.sock"
-	var vhostUserMode vppvhostuser.VhostUserMode = vppvhostuser.ModeServer
-
+	var vhostUserMode bool = true
 	// Set log level
 	//   Logrus has six logging levels: DebugLevel, InfoLevel, WarningLevel, ErrorLevel, FatalLevel and PanicLevel.
 	//core.SetLogger(&logrus.Logger{Level: logrus.InfoLevel})
diff --git a/docker/userspacecni/Dockerfile b/docker/userspacecni/Dockerfile
new file mode 100644
index 00000000..f888470b
--- /dev/null
+++ b/docker/userspacecni/Dockerfile
@@ -0,0 +1,19 @@
+FROM ligato/vpp-base:23.02 as builder
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+COPY . /root/userspace-cni-network-plugin
+WORKDIR /root/userspace-cni-network-plugin
+RUN apt-get update -y 
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y binutils wget make git
+RUN wget -qO- https://golang.org/dl/go1.20.1.linux-amd64.tar.gz | tar -C /usr/local -xz
+ENV PATH="${PATH}:/usr/local/go/bin"
+RUN go mod download
+RUN make generate
+RUN go mod tidy
+RUN make build
+#End of builder container
+
+# Copy build userspace cni bin to a small deployer container
+FROM ubuntu:22.04
+RUN mkdir -p /root/userspace-cni-network-plugin/userspace
+COPY --from=builder /root/userspace-cni-network-plugin/userspace/userspace /root/userspace-cni-network-plugin/userspace/userspace
+CMD ["cp", "-rf", "/root/userspace-cni-network-plugin/userspace/userspace", "/opt/cni/bin"]
diff --git a/docker/usrsp-app/usrsp-app.go b/docker/usrsp-app/usrsp-app.go
index 12e2e97a..9d9864e1 100644
--- a/docker/usrsp-app/usrsp-app.go
+++ b/docker/usrsp-app/usrsp-app.go
@@ -35,9 +35,7 @@ import (
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
 )
 
-//
 // Constants
-//
 const (
 	dbgApp = true
 )
@@ -50,9 +48,7 @@ const (
 // API Functions
 //
 
-//
 // Utility Functions
-//
 const DefaultAnnotationsFile = "/etc/podinfo/annotations"
 
 func cniContainerConfig() (bool, string, error) {
@@ -91,16 +87,14 @@ func cniContainerConfig() (bool, string, error) {
 			err = fmt.Errorf("ERROR: Unknown Host Engine:" + ifaceList[i].NetConf.HostConf.Engine)
 		}
 		if err != nil {
-			logging.Errorf("USRSP_APP: %v", err)
+			_ = logging.Errorf("USRSP_APP: %v", err)
 		}
 	}
 
 	return found, engine, err
 }
 
-//
 // main
-//
 func main() {
 	var count int = 0
 	var engine string
diff --git a/go.mod b/go.mod
index aeaabe0f..5d32a4ad 100644
--- a/go.mod
+++ b/go.mod
@@ -1,23 +1,65 @@
 module github.com/intel/userspace-cni-network-plugin
 
-go 1.14
+go 1.20
 
 require (
-	git.fd.io/govpp.git v0.3.5
-	github.com/containernetworking/cni v0.8.1
-	github.com/containernetworking/plugins v0.8.6
-	github.com/go-logfmt/logfmt v0.5.0
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/containernetworking/cni v1.1.2
+	github.com/containernetworking/plugins v1.2.0
+	github.com/go-logfmt/logfmt v0.6.0
 	github.com/pkg/errors v0.9.1
-	github.com/safchain/ethtool v0.0.0-20200804214954-8f958a28363a // indirect
-	github.com/sirupsen/logrus v1.7.0
-	github.com/stretchr/testify v1.6.1
-	github.com/vishvananda/netlink v1.1.0
-	golang.org/x/sys v0.1.0
-	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
-	k8s.io/api v0.20.0
-	k8s.io/apimachinery v0.20.0
-	k8s.io/client-go v0.20.0
+	github.com/sirupsen/logrus v1.8.1
+	github.com/stretchr/testify v1.8.1
+	github.com/vishvananda/netlink v1.2.1-beta.2
+	go.fd.io/govpp v0.7.0
+	golang.org/x/sys v0.8.0
+	k8s.io/api v0.27.1
+	k8s.io/apimachinery v0.27.1
+	k8s.io/client-go v0.27.1
+)
+
+require (
+	github.com/bennyscetbun/jsongo v1.1.0 // indirect
+	github.com/coreos/go-iptables v0.6.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/safchain/ethtool v0.2.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 5791aa36..56007b6b 100644
--- a/go.sum
+++ b/go.sum
@@ -9,93 +9,76 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-git.fd.io/govpp.git v0.3.5 h1:ehm5LvXJSgapKdjxRETbi5I75rWFcL5Fq84IHDZ9PF0=
-git.fd.io/govpp.git v0.3.5/go.mod h1:SaURD+s2tyKdTyPdzAiHaoHwG6KEzIkPY1ZOdxU63qU=
-github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
-github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
-github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
-github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
+github.com/bennyscetbun/jsongo v1.1.0 h1:ZDSks3aLP13jhY139lWaUqZaU8G0tELMohzumut/KDM=
 github.com/bennyscetbun/jsongo v1.1.0/go.mod h1:suxbVmjBV8+A2BBAM5EYVh6Uj8j3rqJhzWf3hv7Ff8U=
-github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
-github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI=
-github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
-github.com/containernetworking/plugins v0.8.6 h1:npZTLiMa4CRn6m5P9+1Dz4O1j0UeFbm8VYN6dlsw568=
-github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM=
-github.com/coreos/go-iptables v0.4.5 h1:DpHb9vJrZQEFMcVLFKAAGMUVX0XoRC0ptCthinRYm38=
-github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
-github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
-github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
-github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ=
+github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
+github.com/containernetworking/plugins v1.2.0 h1:SWgg3dQG1yzUo4d9iD8cwSVh1VqI+bP7mkPDoSfP9VU=
+github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4=
+github.com/coreos/go-iptables v0.6.0 h1:is9qnZMPYjLd8LYqmm/qlE+wwEgJIkTYdhV3rfZo4jk=
+github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
-github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fsnotify/fsnotify v0.0.0-20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff/go.mod h1:yUhRXHewUVJ1k89wHKP68xfzk7kwXUx/DV1nx4EBMbw=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8=
+github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -107,143 +90,151 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
+github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I=
-github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lunixbochs/struc v0.0.0-20190916212049-a5c72983bc42/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
-github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
-github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe h1:ewr1srjRCmcQogPQ/NCx6XCk6LGVmsVCc9Y3vvPZj+Y=
+github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/safchain/ethtool v0.0.0-20200804214954-8f958a28363a h1:TXFp1qmI50hk8dfGl7o8PKT9Lxo84T7RlpKCOB1DndI=
-github.com/safchain/ethtool v0.0.0-20200804214954-8f958a28363a/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
-github.com/sirupsen/logrus v1.0.0/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/safchain/ethtool v0.2.0 h1:dILxMBqDnQfX192cCAPjZr9v2IgVXeElHPy435Z/IdE=
+github.com/safchain/ethtool v0.2.0/go.mod h1:WkKB1DnNtvsMlDmQ50sgwowDJV/hGbJSOvJoEXs1AJQ=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
-github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
-github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
+github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
+github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA=
+github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.fd.io/govpp v0.7.0 h1:8qideC7G0xPeYz2sjwni8GKWWbNk45Ev73oR1igKDYY=
+go.fd.io/govpp v0.7.0/go.mod h1:VxUPq8HGQH6/9IL9saMURL3UcHsUuN8XmETuao5HA7o=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
-golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -277,7 +268,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -285,10 +275,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -296,23 +285,35 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170427041856-9ccfe848b9db/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -321,39 +322,58 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -363,7 +383,6 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -383,13 +402,24 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -400,13 +430,21 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -424,15 +462,31 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -441,54 +495,58 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
-gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.0.0-20170407172122-cd8b52f8269e/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.20.0 h1:WwrYoZNM1W1aQEbyl8HNG+oWGzLpZQBlcerS9BQw9yI=
-k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg=
-k8s.io/apimachinery v0.20.0 h1:jjzbTJRXk0unNS71L7h3lxGDH/2HPxMPaQY+MjECKL8=
-k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/client-go v0.20.0 h1:Xlax8PKbZsjX4gFvNtt4F5MoJ1V5prDvCuoq9B7iax0=
-k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
-k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
-k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.27.1 h1:Z6zUGQ1Vd10tJ+gHcNNNgkV5emCyW+v2XTmn+CLjSd0=
+k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E=
+k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
+k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
+k8s.io/client-go v0.27.1 h1:oXsfhW/qncM1wDmWBIuDzRHNS2tLhK3BZv512Nc59W8=
+k8s.io/client-go v0.27.1/go.mod h1:f8LHMUkVb3b9N8bWturc+EDtVVVwZ7ueTVquFAJb2vA=
+k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
+k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
+k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
+k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
+k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/hardened-binary b/hardened-binary
new file mode 100755
index 00000000..f8d95e85
Binary files /dev/null and b/hardened-binary differ
diff --git a/logging/logging_test.go b/logging/logging_test.go
index df8ac9b7..32be55bb 100644
--- a/logging/logging_test.go
+++ b/logging/logging_test.go
@@ -17,7 +17,6 @@ package logging
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -322,7 +321,7 @@ func TestLogFunctions(t *testing.T) {
 			case "Warningf":
 				Warningf(tc.format, tc.arguments...)
 			case "Errorf":
-				Errorf(tc.format, tc.arguments...)
+				_ = Errorf(tc.format, tc.arguments...)
 			case "Panicf":
 				Panicf(tc.format, tc.arguments...)
 			default:
@@ -332,7 +331,7 @@ func TestLogFunctions(t *testing.T) {
 			os.Stderr = origStdErr
 			stdW.Close()
 			var buf bytes.Buffer
-			io.Copy(&buf, stdR)
+			_, _ = io.Copy(&buf, stdR)
 
 			if tc.expResultStdE != "" {
 				assert.Regexp(t, tc.expResultStdE, buf.String(), "Unexpected stderr log")
@@ -342,7 +341,7 @@ func TestLogFunctions(t *testing.T) {
 
 			if tc.expResultFile != "" {
 				logW.Close()
-				io.Copy(&buf, logR)
+				_, _ = io.Copy(&buf, logR)
 				assert.Regexp(t, tc.expResultFile, buf.String(), "Unexpected file log")
 			}
 		})
@@ -509,7 +508,7 @@ func TestSetLogFile(t *testing.T) {
 			}()
 
 			if tc.file == "#random#" {
-				logFile, err := ioutil.TempFile("/tmp", "test-logging-")
+				logFile, err := os.CreateTemp("/tmp", "test-logging-")
 				require.NoError(t, err, "Can't create log file")
 				logFile.Close()
 				os.Remove(logFile.Name())
@@ -527,7 +526,7 @@ func TestSetLogFile(t *testing.T) {
 			os.Stderr = origStdErr
 			stdW.Close()
 			var buf bytes.Buffer
-			io.Copy(&buf, stdR)
+			_, _ = io.Copy(&buf, stdR)
 
 			if tc.expError == "" {
 				assert.Empty(t, buf.String(), "Unexpected error")
diff --git a/pkg/annotations/annotations.go b/pkg/annotations/annotations.go
index dba71529..d6d4089b 100644
--- a/pkg/annotations/annotations.go
+++ b/pkg/annotations/annotations.go
@@ -13,10 +13,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"path/filepath"
 	"strings"
-
+	"os"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
 
@@ -152,7 +151,7 @@ func WritePodAnnotation(kubeClient kubernetes.Interface,
 
 		modifiedConfig, err = setPodAnnotationConfigData(pod, configData)
 		if err != nil {
-			logging.Errorf("SaveRemoteConfig: Error formatting annotation configData: %v", err)
+			_ = logging.Errorf("SaveRemoteConfig: Error formatting annotation configData: %v", err)
 			return pod, err
 		}
 
@@ -164,18 +163,17 @@ func WritePodAnnotation(kubeClient kubernetes.Interface,
 			mappedSharedDir = DefaultBaseCNIDir
 			logging.Warningf("SaveRemoteConfig: Error reading VolumeMount: %v", err)
 			logging.Warningf("SaveRemoteConfig: VolumeMount \"shared-dir\" not provided, defaulting to: %s", mappedSharedDir)
-			err = nil
 		}
 		modifiedMappedDir, err = setPodAnnotationMappedDir(pod, mappedSharedDir)
 		if err != nil {
-			logging.Errorf("SaveRemoteConfig: Error formatting annotation mappedSharedDir - %v", err)
+			_ = logging.Errorf("SaveRemoteConfig: Error formatting annotation mappedSharedDir - %v", err)
 			return pod, err
 		}
 
-		if modifiedConfig == true || modifiedMappedDir == true {
+		if modifiedConfig || modifiedMappedDir {
 			pod, err = commitAnnotation(kubeClient, pod)
 			if err != nil {
-				logging.Errorf("SaveRemoteConfig: Error writing annotations - %v", err)
+				_ = logging.Errorf("SaveRemoteConfig: Error writing annotations - %v", err)
 				return pod, err
 			}
 		}
@@ -186,9 +184,7 @@ func WritePodAnnotation(kubeClient kubernetes.Interface,
 	return pod, err
 }
 
-//
 // Local Utility Functions
-//
 func setPodAnnotationMappedDir(pod *v1.Pod,
 	mappedDir string) (bool, error) {
 	var modified bool
@@ -282,17 +278,15 @@ func commitAnnotation(kubeClient kubernetes.Interface,
 	return k8sclient.WritePodAnnotation(kubeClient, pod)
 }
 
-//
 // Container Access Functions
 // These functions can be called from code running in a container. It reads
 // the data from the exposed Downward API.
-//
 func getFileAnnotation(annotFile string, annotIndex string) ([]byte, error) {
 	var rawData []byte
 
-	fileData, err := ioutil.ReadFile(annotFile)
+	fileData, err := os.ReadFile(annotFile)
 	if err != nil {
-		logging.Errorf("getFileAnnotation: File Read ERROR - %v", err)
+		_ = logging.Errorf("getFileAnnotation: File Read ERROR - %v", err)
 		return rawData, fmt.Errorf("error reading %s: %s", annotFile, err)
 	}
 
@@ -334,7 +328,7 @@ func GetFileAnnotationConfigData(annotFile string) ([]*types.ConfigurationData,
 	}
 
 	rawString := string(rawData)
-	if strings.IndexAny(rawString, "[{\"") >= 0 {
+	if strings.ContainsAny(rawString, "[{\"") {
 		if err := json.Unmarshal([]byte(rawString), &configDataList); err != nil {
 			return nil, logging.Errorf("GetFileAnnotationConfigData: Failed to parse ConfigData Annotation JSON format: %v", err)
 		}
diff --git a/pkg/annotations/annotations_test.go b/pkg/annotations/annotations_test.go
index a789c5d6..73fe6b03 100644
--- a/pkg/annotations/annotations_test.go
+++ b/pkg/annotations/annotations_test.go
@@ -17,7 +17,6 @@ package annotations
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -251,7 +250,7 @@ func TestWritePodAnnotation(t *testing.T) {
 			var kubeClient kubernetes.Interface
 			var pod *v1.Pod
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-annotation-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-annotation-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(sharedDir)
 
@@ -475,7 +474,7 @@ func TestCommitAnnotation(t *testing.T) {
 			var kubeClient kubernetes.Interface
 			var pod *v1.Pod
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-k8sclient-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-k8sclient-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(sharedDir)
 
@@ -562,17 +561,17 @@ func TestGetFileAnnotation(t *testing.T) {
 			if tc.defaultFile {
 				// modify expected error in case that default file exists
 				if _, err = os.Stat("/etc/podinfo/annotations"); err == nil {
-					tc.expErr = errors.New(fmt.Sprintf(`ERROR: "%v" missing from pod annotation`, tc.annotIndex))
+					tc.expErr = fmt.Errorf(fmt.Sprintf(`ERROR: "%v" missing from pod annotation`, tc.annotIndex))
 				}
 				result, err = getFileAnnotation(tc.annotIndex, "")
 			} else {
-				testDir, err = ioutil.TempDir("/tmp", "test-annotation-")
+				testDir, err = os.MkdirTemp("/tmp", "test-annotation-")
 				require.NoError(t, err, "Can't create temporary directory")
 				defer os.RemoveAll(testDir)
 
 				annotFile = filepath.Join(testDir, "annotations")
 				if len(tc.annot) > 0 {
-					ioutil.WriteFile(annotFile, []byte(tc.annot), 0644)
+					_ = os.WriteFile(annotFile, []byte(tc.annot), 0644)
 				}
 				result, err = getFileAnnotation(annotFile, tc.annotIndex)
 			}
@@ -609,13 +608,13 @@ func TestGetFileAnnotationMappedDir(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			testDir, err := ioutil.TempDir("/tmp", "test-annotation-")
+			testDir, err := os.MkdirTemp("/tmp", "test-annotation-")
 			require.NoError(t, err, "Can't create temporary directory")
 			defer os.RemoveAll(testDir)
 
 			annotFile := filepath.Join(testDir, "annotations")
 			if len(tc.annot) > 0 {
-				ioutil.WriteFile(annotFile, []byte(tc.annot), 0644)
+				_ = os.WriteFile(annotFile, []byte(tc.annot), 0644)
 			}
 			result, err := GetFileAnnotationMappedDir(annotFile)
 
@@ -662,13 +661,13 @@ func TestGetFileAnnotationConfigData(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			testDir, err := ioutil.TempDir("/tmp", "test-annotation-")
+			testDir, err := os.MkdirTemp("/tmp", "test-annotation-")
 			require.NoError(t, err, "Can't create temporary directory")
 			defer os.RemoveAll(testDir)
 
 			annotFile := filepath.Join(testDir, "annotations")
 			if len(tc.annot) > 0 {
-				ioutil.WriteFile(annotFile, []byte(tc.annot), 0644)
+				_ = os.WriteFile(annotFile, []byte(tc.annot), 0644)
 			}
 			result, err := GetFileAnnotationConfigData(annotFile)
 
diff --git a/pkg/configdata/configdata.go b/pkg/configdata/configdata.go
index 9ecbebd7..6084c094 100644
--- a/pkg/configdata/configdata.go
+++ b/pkg/configdata/configdata.go
@@ -24,7 +24,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -32,7 +31,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 
 	"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
@@ -42,7 +41,6 @@ import (
 //
 // Constants
 //
-const debugUsrSpDb = false
 
 const DefaultOvsCNIDir = "/usr/local/var/run/openvswitch"
 const DefaultVppCNIDir = "/var/run/vpp"
@@ -160,7 +158,7 @@ func SaveRemoteConfig(conf *types.NetConf,
 
 		dataBytes, jsonErr := json.Marshal(configData)
 		if jsonErr == nil {
-			err = ioutil.WriteFile(path, dataBytes, 0644)
+			err = os.WriteFile(path, dataBytes, 0644)
 		} else {
 			return pod, fmt.Errorf("ERROR: serializing REMOTE NetConf data: %v", err)
 		}
diff --git a/pkg/configdata/configdata_test.go b/pkg/configdata/configdata_test.go
index 567322dd..059264a5 100644
--- a/pkg/configdata/configdata_test.go
+++ b/pkg/configdata/configdata_test.go
@@ -19,14 +19,13 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 	"github.com/intel/userspace-cni-network-plugin/userspace/testdata"
 	"github.com/stretchr/testify/assert"
@@ -186,7 +185,7 @@ func TestSaveRemoteConfig(t *testing.T) {
 			var resPod *v1.Pod
 			var resErr error
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-configdata-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-configdata-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			// remove sharedDir if needed
 			defer os.RemoveAll(sharedDir)
@@ -235,7 +234,7 @@ func TestSaveRemoteConfig(t *testing.T) {
 					fileName = filepath.Join(sharedDir, fileName)
 					require.FileExists(t, fileName, "Container data were not saved to file")
 					var err error
-					data, err = ioutil.ReadFile(fileName)
+					data, err = os.ReadFile(fileName)
 					require.NoError(t, err, "Can't read saved container data")
 				} else {
 					// data saved to resPod Annotations
@@ -283,7 +282,7 @@ func TestCleanupRemoteConfig(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tempDir, dirErr := ioutil.TempDir("/tmp", "test-configdata-")
+			tempDir, dirErr := os.MkdirTemp("/tmp", "test-configdata-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			// remove tempDir if needed
 			defer os.RemoveAll(tempDir)
@@ -314,7 +313,7 @@ func TestCleanupRemoteConfig(t *testing.T) {
 			os.Stdout = origStdOut
 			stdW.Close()
 			var buf bytes.Buffer
-			io.Copy(&buf, stdR)
+			_, _ = io.Copy(&buf, stdR)
 
 			if tc.expOut != "" {
 				assert.Contains(t, buf.String(), tc.expOut, "Unexpected standard output")
@@ -375,7 +374,7 @@ func TestFileCleanup(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tempDir, dirErr := ioutil.TempDir("/tmp", "test-configdata-")
+			tempDir, dirErr := os.MkdirTemp("/tmp", "test-configdata-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			// remove tempDir if needed
 			defer os.RemoveAll(tempDir)
@@ -461,7 +460,7 @@ func TestGetRemoteConfig(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			tempDir, dirErr := ioutil.TempDir("/tmp", "test-configdata-")
+			tempDir, dirErr := os.MkdirTemp("/tmp", "test-configdata-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			// remove tempDir if needed
 			defer os.RemoveAll(tempDir)
@@ -469,7 +468,7 @@ func TestGetRemoteConfig(t *testing.T) {
 			annotFile := filepath.Join(tempDir, "annotations")
 			if tc.annotations != "" {
 				tc.annotations = strings.Replace(tc.annotations, "#tempDir#", tempDir, -1)
-				ioutil.WriteFile(annotFile, []byte(tc.annotations), 0644)
+				_ = os.WriteFile(annotFile, []byte(tc.annotations), 0644)
 			}
 			tc.expDir = strings.Replace(tc.expDir, "#tempDir#", tempDir, -1)
 
diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go
index f654bb2b..289ecaef 100644
--- a/pkg/k8sclient/k8sclient.go
+++ b/pkg/k8sclient/k8sclient.go
@@ -96,8 +96,8 @@ func getK8sClient(kubeClient kubernetes.Interface, kubeConfig string) (kubernete
 }
 
 func GetPod(args *skel.CmdArgs,
-			kubeClient kubernetes.Interface,
-			kubeConfig string) (*v1.Pod, kubernetes.Interface, error) {
+	kubeClient kubernetes.Interface,
+	kubeConfig string) (*v1.Pod, kubernetes.Interface, error) {
 	var err error
 
 	logging.Verbosef("GetPod: ENTER - %v, %v, %v", args, kubeClient, kubeConfig)
@@ -105,14 +105,14 @@ func GetPod(args *skel.CmdArgs,
 	// Get k8sArgs
 	k8sArgs, err := getK8sArgs(args)
 	if err != nil {
-		logging.Errorf("GetPod: Err in getting k8s args: %v", err)
+		_ = logging.Errorf("GetPod: Err in getting k8s args: %v", err)
 		return nil, kubeClient, err
 	}
 
 	// Get kubeClient. If passed in, GetK8sClient() will just return it back.
 	kubeClient, err = getK8sClient(kubeClient, kubeConfig)
 	if err != nil {
-		logging.Errorf("GetPod: Err in getting kubeClient: %v", err)
+		_ = logging.Errorf("GetPod: Err in getting kubeClient: %v", err)
 		return nil, kubeClient, err
 	}
 
diff --git a/pkg/k8sclient/k8sclient_test.go b/pkg/k8sclient/k8sclient_test.go
index cec7a703..3310550a 100644
--- a/pkg/k8sclient/k8sclient_test.go
+++ b/pkg/k8sclient/k8sclient_test.go
@@ -17,7 +17,6 @@ package k8sclient
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"testing"
@@ -223,7 +222,7 @@ func TestGetPod(t *testing.T) {
 				args = testdata.GetTestArgs()
 				kubeClient = fake.NewSimpleClientset()
 			default:
-				sharedDir, dirErr := ioutil.TempDir("/tmp", "test-k8sclient-")
+				sharedDir, dirErr := os.MkdirTemp("/tmp", "test-k8sclient-")
 				require.NoError(t, dirErr, "Can't create temporary directory")
 				defer os.RemoveAll(sharedDir)
 
@@ -277,7 +276,7 @@ func TestWritePodAnnotation(t *testing.T) {
 			var kubeClient kubernetes.Interface
 			var pod *v1.Pod
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-k8sclient-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-k8sclient-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			defer os.RemoveAll(sharedDir)
 
diff --git a/pkg/types/types.go b/pkg/types/types.go
index 69b85945..d6e52c6c 100644
--- a/pkg/types/types.go
+++ b/pkg/types/types.go
@@ -16,12 +16,10 @@ package types
 
 import (
 	"github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 )
 
-//
 // Exported Types
-//
 type MemifConf struct {
 	Role string `json:"role,omitempty"` // Role of memif: master|slave
 	Mode string `json:"mode,omitempty"` // Mode of memif: ip|ethernet|inject-punt
@@ -115,9 +113,9 @@ type NetConf struct {
 }
 
 // Defines the JSON data written to container. It is either written to:
-//  1) Annotation - "userspace/configuration-data"
-//  -- OR --
-//  2) a file in the directory designated by NetConf.SharedDir.
+//  1. Annotation - "userspace/configuration-data"
+//     -- OR --
+//  2. a file in the directory designated by NetConf.SharedDir.
 type ConfigurationData struct {
 	ContainerId string         `json:"containerId"` // From args.ContainerId, used locally. Used in several place, namely in the socket filenames.
 	IfName      string         `json:"ifName"`      // From args.IfName, used locally. Used in several place, namely in the socket filenames.
@@ -125,3 +123,5 @@ type ConfigurationData struct {
 	Config      UserSpaceConf  `json:"config"`      // From NetConf.ContainerConf
 	IPResult    current.Result `json:"ipResult"`    // Network Status also has IP, but wrong format
 }
+
+const DefaultSwIfIndex = 4294967295 // vpp default interface id, used when querying bridges
diff --git a/userspace/userspace.go b/userspace/userspace.go
index 1eaaae84..5a5b82d1 100644
--- a/userspace/userspace.go
+++ b/userspace/userspace.go
@@ -16,9 +16,9 @@ package main
 
 import (
 	"encoding/json"
+	_ "flag"
 	"fmt"
 	"runtime"
-	_ "flag"
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
@@ -26,7 +26,7 @@ import (
 	"github.com/containernetworking/cni/pkg/invoke"
 	"github.com/containernetworking/cni/pkg/skel"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 	cniSpecVersion "github.com/containernetworking/cni/pkg/version"
 	"github.com/containernetworking/plugins/pkg/ip"
 	"github.com/containernetworking/plugins/pkg/ipam"
@@ -34,11 +34,11 @@ import (
 
 	"github.com/intel/userspace-cni-network-plugin/cniovs"
 	"github.com/intel/userspace-cni-network-plugin/cnivpp"
-	"github.com/intel/userspace-cni-network-plugin/pkg/k8sclient"
 	"github.com/intel/userspace-cni-network-plugin/logging"
-	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 	"github.com/intel/userspace-cni-network-plugin/pkg/annotations"
 	"github.com/intel/userspace-cni-network-plugin/pkg/configdata"
+	"github.com/intel/userspace-cni-network-plugin/pkg/k8sclient"
+	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 
 	_ "github.com/vishvananda/netlink"
 )
@@ -84,29 +84,29 @@ func loadNetConf(bytes []byte) (*types.NetConf, error) {
 	// Parse previous result
 	//
 	/*
-	if netconf.RawPrevResult != nil {
-		resultBytes, err := json.Marshal(netconf.RawPrevResult)
-		if err != nil {
-			return nil, logging.Errorf("could not serialize prevResult: %v", err)
-		}
-		res, err := cniSpecVersion.NewResult(netconf.CNIVersion, resultBytes)
-		if err != nil {
-			return nil, logging.Errorf("could not parse prevResult: %v", err)
-		}
-		netconf.RawPrevResult = nil
-		netconf.PrevResult, err = current.NewResultFromResult(res)
-		if err != nil {
-			return nil, logging.Errorf("could not convert result to current version: %v", err)
+		if netconf.RawPrevResult != nil {
+			resultBytes, err := json.Marshal(netconf.RawPrevResult)
+			if err != nil {
+				return nil, logging.Errorf("could not serialize prevResult: %v", err)
+			}
+			res, err := cniSpecVersion.NewResult(netconf.CNIVersion, resultBytes)
+			if err != nil {
+				return nil, logging.Errorf("could not parse prevResult: %v", err)
+			}
+			netconf.RawPrevResult = nil
+			netconf.PrevResult, err = current.NewResultFromResult(res)
+			if err != nil {
+				return nil, logging.Errorf("could not convert result to current version: %v", err)
+			}
 		}
-	}
 	*/
 
 	return netconf, nil
 }
 
 func getPodAndSharedDir(netConf *types.NetConf,
-						args *skel.CmdArgs,
-						kubeClient kubernetes.Interface) (kubernetes.Interface, *v1.Pod, string, error) {
+	args *skel.CmdArgs,
+	kubeClient kubernetes.Interface) (kubernetes.Interface, *v1.Pod, string, error) {
 
 	var found bool
 	var pod *v1.Pod
@@ -132,8 +132,7 @@ func getPodAndSharedDir(netConf *types.NetConf,
 
 	err = nil
 
-
-	if found == false {
+	if !found {
 		if netConf.SharedDir != "" {
 			if netConf.SharedDir[len(netConf.SharedDir)-1:] == "/" {
 				sharedDir = fmt.Sprintf("%s%s/", netConf.SharedDir, args.ContainerID[:12])
@@ -153,7 +152,7 @@ func getPodAndSharedDir(netConf *types.NetConf,
 				logging.Warningf("getPodAndSharedDir: Neither \"KubeConfig\" nor \"SharedDir\" provided, defaulting to %s", sharedDir)
 			} else {
 				logging.Warningf("getPodAndSharedDir: \"KubeConfig\" invalid and \"SharedDir\" not provided, defaulting to %s", sharedDir)
-			}	
+			}
 		}
 	}
 
@@ -175,7 +174,7 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		args, netConf, exec, kubeClient)
 
 	if err != nil {
-		logging.Errorf("cmdAdd: Parse NetConf - %v", err)
+		_ = logging.Errorf("cmdAdd: Parse NetConf - %v", err)
 		return err
 	}
 
@@ -195,16 +194,14 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		Sandbox: netns.Path(),
 	}}
 
-
 	// Retrieve the "SharedDir", directory to create the socketfile in.
 	// Save off kubeClient and pod for later use if needed.
 	kubeClient, pod, sharedDir, err := getPodAndSharedDir(netConf, args, kubeClient)
 	if err != nil {
-		logging.Errorf("cmdAdd: Unable to determine \"SharedDir\" - %v", err)
+		_ = logging.Errorf("cmdAdd: Unable to determine \"SharedDir\" - %v", err)
 		return err
 	}
 
-
 	//
 	// HOST:
 	//
@@ -218,7 +215,7 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		err = fmt.Errorf("ERROR: Unknown Host Engine:" + netConf.HostConf.Engine)
 	}
 	if err != nil {
-		logging.Errorf("cmdAdd: Host ERROR - %v", err)
+		_ = logging.Errorf("cmdAdd: Host ERROR - %v", err)
 		return err
 	}
 
@@ -232,7 +229,7 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		// run the IPAM plugin and get back the config to apply
 		ipamResult, err := ipam.ExecAdd(netConf.IPAM.Type, args.StdinData)
 		if err != nil {
-			logging.Errorf("cmdAdd: IPAM ERROR - %v", err)
+			_ = logging.Errorf("cmdAdd: IPAM ERROR - %v", err)
 			return err
 		}
 
@@ -240,14 +237,14 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		newResult, err := current.NewResultFromResult(ipamResult)
 		if err != nil {
 			// TBD: CLEAN-UP
-			logging.Errorf("cmdAdd: IPAM Result ERROR - %v", err)
+			_ = logging.Errorf("cmdAdd: IPAM Result ERROR - %v", err)
 			return err
 		}
 
 		if len(newResult.IPs) == 0 {
 			// TBD: CLEAN-UP
 			err = fmt.Errorf("ERROR: Unable to get IP Address")
-			logging.Errorf("cmdAdd: IPAM ERROR - %v", err)
+			_ = logging.Errorf("cmdAdd: IPAM ERROR - %v", err)
 			return err
 		}
 
@@ -279,34 +276,32 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		err = fmt.Errorf("ERROR: Unknown Container Engine:" + containerEngine)
 	}
 	if err != nil {
-		logging.Errorf("cmdAdd: Container ERROR - %v", err)
+		_ = logging.Errorf("cmdAdd: Container ERROR - %v", err)
 		return err
 	}
 
 	return cnitypes.PrintResult(result, current.ImplementedSpecVersion)
 }
 
-
 func cmdGet(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interface) error {
-/*
-	netConf, err := loadNetConf(args.StdinData)
+	/*
+		netConf, err := loadNetConf(args.StdinData)
 
-	logging.Infof("cmdGet: (AFTER LOAD) - Container %s Iface %s", args.ContainerID[:12], args.IfName)
-	logging.Verbosef("   Args=%v netConf=%v, exec=%v, kubeClient%v",
-		args, netConf, exec, kubeClient)
+		logging.Infof("cmdGet: (AFTER LOAD) - Container %s Iface %s", args.ContainerID[:12], args.IfName)
+		logging.Verbosef("   Args=%v netConf=%v, exec=%v, kubeClient%v",
+			args, netConf, exec, kubeClient)
 
-	if err != nil {
-		return err
-	}
+		if err != nil {
+			return err
+		}
 
-	// FIXME: call all delegates
+		// FIXME: call all delegates
 
-	return cnitypes.PrintResult(netConf.PrevResult, netConf.CNIVersion)
-*/
+		return cnitypes.PrintResult(netConf.PrevResult, netConf.CNIVersion)
+	*/
 	return nil
 }
 
-
 func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interface) error {
 	var netConf *types.NetConf
 	var containerEngine string
@@ -322,20 +317,18 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		args, netConf, exec, kubeClient)
 
 	if err != nil {
-		logging.Errorf("cmdDel: Parse NetConf - %v", err)
+		_ = logging.Errorf("cmdDel: Parse NetConf - %v", err)
 		return err
 	}
 
-
 	// Retrieve the "SharedDir", directory to create the socketfile in.
 	// Save off kubeClient and pod for later use if needed.
 	_, pod, sharedDir, err := getPodAndSharedDir(netConf, args, kubeClient)
 	if err != nil {
-		logging.Errorf("cmdDel: Unable to determine \"SharedDir\" - %v", err)
+		_ = logging.Errorf("cmdDel: Unable to determine \"SharedDir\" - %v", err)
 		return err
 	}
 
-
 	//
 	// HOST:
 	//
@@ -349,7 +342,7 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		err = fmt.Errorf("ERROR: Unknown Host Engine:" + netConf.HostConf.Engine)
 	}
 	if err != nil {
-		logging.Errorf("cmdDel: Host ERROR - %v", err)
+		_ = logging.Errorf("cmdDel: Host ERROR - %v", err)
 		return err
 	}
 
@@ -374,7 +367,7 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 		err = fmt.Errorf("ERROR: Unknown Container Engine:" + containerEngine)
 	}
 	if err != nil {
-		logging.Errorf("cmdDel: Container ERROR - %v", err)
+		_ = logging.Errorf("cmdDel: Container ERROR - %v", err)
 		return err
 	}
 
@@ -384,7 +377,7 @@ func cmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient kubernetes.Interfac
 	if netConf.IPAM.Type != "" {
 		err = ipam.ExecDel(netConf.IPAM.Type, args.StdinData)
 		if err != nil {
-			logging.Errorf("cmdDel: IPAM ERROR - %v", err)
+			_ = logging.Errorf("cmdDel: IPAM ERROR - %v", err)
 			return err
 		}
 	}
diff --git a/userspace/userspace_test.go b/userspace/userspace_test.go
index c59cc098..d5f249b2 100644
--- a/userspace/userspace_test.go
+++ b/userspace/userspace_test.go
@@ -20,7 +20,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -124,7 +123,7 @@ func TestLoadNetConf(t *testing.T) {
 			os.Stderr = origStdErr
 			stdW.Close()
 			var buf bytes.Buffer
-			io.Copy(&buf, stdR)
+			_, _ = io.Copy(&buf, stdR)
 			stdError := buf.String()
 
 			if tc.expStdErr == "" {
@@ -312,13 +311,15 @@ func TestCmdAdd(t *testing.T) {
 			if tc.netNS == "generate" {
 				netNS, nsErr := testutils.NewNS()
 				require.NoError(t, nsErr, "Can't create NewNS")
-				defer testutils.UnmountNS(netNS)
+				defer func() {
+					_ = testutils.UnmountNS(netNS)
+				}()
 				args.Netns = netNS.Path()
 			} else {
 				args.Netns = tc.netNS
 			}
 
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-userspace-")
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-userspace-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			tc.netConfStr = strings.Replace(tc.netConfStr, "#sharedDir#", sharedDir, -1)
 			defer os.RemoveAll(sharedDir)
@@ -348,7 +349,7 @@ func TestCmdAdd(t *testing.T) {
 			os.Stdout = origStdout
 			stdW.Close()
 			var buf bytes.Buffer
-			io.Copy(&buf, stdR)
+			_, _ = io.Copy(&buf, stdR)
 			stdOut := buf.String()
 
 			if tc.expError == "" {
@@ -453,9 +454,10 @@ func TestCmdDel(t *testing.T) {
 
 			netNS, nsErr := testutils.NewNS()
 			require.NoError(t, nsErr, "Can't create NewNS")
-			defer testutils.UnmountNS(netNS)
-
-			sharedDir, dirErr := ioutil.TempDir("/tmp", "test-userspace-")
+			defer func() {
+				_ = testutils.UnmountNS(netNS)
+			}()
+			sharedDir, dirErr := os.MkdirTemp("/tmp", "test-userspace-")
 			require.NoError(t, dirErr, "Can't create temporary directory")
 			testDir := filepath.Join(sharedDir, args.ContainerID[:12])
 			require.NoError(t, os.MkdirAll(testDir, os.ModePerm), "Can't create shared directory")
diff --git a/usrspcni/usrspcni.go b/usrspcni/usrspcni.go
index 2f7b9b6f..514b317a 100644
--- a/usrspcni/usrspcni.go
+++ b/usrspcni/usrspcni.go
@@ -19,7 +19,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/containernetworking/cni/pkg/skel"
-	"github.com/containernetworking/cni/pkg/types/current"
+	current "github.com/containernetworking/cni/pkg/types/100"
 
 	"github.com/intel/userspace-cni-network-plugin/pkg/types"
 )