chore: update tools directory and deployments (#779)

.pipelines/pipeline.yaml

@@ -106,7 +106,7 @@ stages:
             displayName: "Run Tests"
 
           - script: |
-              sudo make hack-images VERSION=$(EnvironmentalVariables.Tag)
+              sudo make tools-images VERSION=$(EnvironmentalVariables.Tag)
               sudo make all-images VERSION=$(EnvironmentalVariables.Tag)
             workingDirectory: "$(modulePath)"
             name: "BuildImages"

Makefile

@@ -80,7 +80,7 @@ CNI_NET_DIR = cni/network/plugin
 CNI_IPAM_DIR = cni/ipam/plugin
 CNI_IPAMV6_DIR = cni/ipam/pluginv6
 CNI_TELEMETRY_DIR = cni/telemetry/service
-ACNCLI_DIR = hack/acncli
+ACNCLI_DIR = tools/acncli
 TELEMETRY_CONF_DIR = telemetry
 CNS_DIR = cns/service
 CNMS_DIR = cnms/service
@@ -258,12 +258,12 @@ all-binaries-platforms:
 	export GOOS=windows; make all-binaries
 
 
-.PHONY: hack
-hack: acncli
+.PHONY: tools
+tools: acncli
 
-.PHONY: hack-images
-hack-images: 
-	docker build -f ./hack/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
+.PHONY: tools-images
+tools-images: 
+	docker build -f ./tools/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
 
 # Build the Azure CNM plugin image, installable with "docker plugin install".
 .PHONY: azure-vnet-plugin-image

cns/azure-cns.yaml

@@ -93,7 +93,7 @@ spec:
           effect: NoSchedule
       containers:
         - name: cns-container
-          image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.0-alpha
+          image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.3
           imagePullPolicy: IfNotPresent
           args: [ "-c", "tcp://$(CNSIpAddress):$(CNSPort)", "-t", "$(CNSLogTarget)"]
           volumeMounts:

hack/README.md

@@ -1,6 +0,0 @@
-# NOTICE: 
-
-## **Tools in this directory are provided as is with no SLA, and not for production use.** They are purely experiments or hackathon projects that have no home.
-
-### Thanks,
-### Azure Container Networking Dev Team

tools/README.md

@@ -0,0 +1,6 @@
+# NOTICE: 
+
+## **Tools in this directory are provided as is.**
+
+### Thanks,
+### Azure Container Networking Dev Team

tools/acncli/cmd/install.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
-	i "github.com/Azure/azure-container-networking/hack/acncli/installer"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
+	i "github.com/Azure/azure-container-networking/tools/acncli/installer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

tools/acncli/cmd/logs.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 	"github.com/nxadm/tail"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

tools/acncli/cmd/root.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

tools/acncli/deployment/manager.yaml

@@ -19,7 +19,7 @@ spec:
       hostNetwork: true
       containers:
         - name: azure-cni-installer
-          image: mcr.microsoft.com/containernetworking/azure-cni-manager:v1.2.0-2-g0671b63 
+          image: mcr.microsoft.com/containernetworking/azure-cni-manager:v1.2.3
           imagePullPolicy: Always
           env:
             - name: AZURE_CNI_OS

tools/acncli/installer/conflist.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	ccn "github.com/Azure/azure-container-networking/cni"
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 type rawPlugin struct {

tools/acncli/installer/install.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 type InstallerConfig struct {

tools/acncli/installer/utils.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 func SetOrUseDefault(setValue, defaultValue string) string {

tools/acncli/main.go

@@ -1,12 +1,12 @@
 package main
 
 import (
-	"github.com/Azure/azure-container-networking/hack/acncli/cmd"
+	"github.com/Azure/azure-container-networking/tools/acncli/cmd"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
-	c "github.com/Azure/azure-container-networking/hack/acncli/api"
+	c "github.com/Azure/azure-container-networking/tools/acncli/api"
 )
 
 var (