Skip to content

Commit 73ae4e0

Browse files
authored
chore: update tools directory and deployments (#779)
1 parent 8307081 commit 73ae4e0

File tree

17 files changed

+24
-24
lines changed

17 files changed

+24
-24
lines changed

.pipelines/pipeline.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ stages:
106106
displayName: "Run Tests"
107107
108108
- script: |
109-
sudo make hack-images VERSION=$(EnvironmentalVariables.Tag)
109+
sudo make tools-images VERSION=$(EnvironmentalVariables.Tag)
110110
sudo make all-images VERSION=$(EnvironmentalVariables.Tag)
111111
workingDirectory: "$(modulePath)"
112112
name: "BuildImages"

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ CNI_NET_DIR = cni/network/plugin
8080
CNI_IPAM_DIR = cni/ipam/plugin
8181
CNI_IPAMV6_DIR = cni/ipam/pluginv6
8282
CNI_TELEMETRY_DIR = cni/telemetry/service
83-
ACNCLI_DIR = hack/acncli
83+
ACNCLI_DIR = tools/acncli
8484
TELEMETRY_CONF_DIR = telemetry
8585
CNS_DIR = cns/service
8686
CNMS_DIR = cnms/service
@@ -258,12 +258,12 @@ all-binaries-platforms:
258258
export GOOS=windows; make all-binaries
259259

260260

261-
.PHONY: hack
262-
hack: acncli
261+
.PHONY: tools
262+
tools: acncli
263263

264-
.PHONY: hack-images
265-
hack-images:
266-
docker build -f ./hack/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
264+
.PHONY: tools-images
265+
tools-images:
266+
docker build -f ./tools/acncli/Dockerfile --build-arg VERSION=$(VERSION) -t $(AZURE_CNI_IMAGE):$(VERSION) .
267267

268268
# Build the Azure CNM plugin image, installable with "docker plugin install".
269269
.PHONY: azure-vnet-plugin-image

cns/azure-cns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ spec:
9393
effect: NoSchedule
9494
containers:
9595
- name: cns-container
96-
image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.0-alpha
96+
image: mcr.microsoft.com/containernetworking/azure-cns:v1.2.3
9797
imagePullPolicy: IfNotPresent
9898
args: [ "-c", "tcp://$(CNSIpAddress):$(CNSPort)", "-t", "$(CNSLogTarget)"]
9999
volumeMounts:

hack/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

tools/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# NOTICE:
2+
3+
## **Tools in this directory are provided as is.**
4+
5+
### Thanks,
6+
### Azure Container Networking Dev Team
File renamed without changes.
File renamed without changes.
File renamed without changes.

hack/acncli/cmd/install.go renamed to tools/acncli/cmd/install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"strings"
66

7-
c "github.com/Azure/azure-container-networking/hack/acncli/api"
8-
i "github.com/Azure/azure-container-networking/hack/acncli/installer"
7+
c "github.com/Azure/azure-container-networking/tools/acncli/api"
8+
i "github.com/Azure/azure-container-networking/tools/acncli/installer"
99
"github.com/spf13/cobra"
1010
"github.com/spf13/viper"
1111
)

hack/acncli/cmd/logs.go renamed to tools/acncli/cmd/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"fmt"
55

6-
c "github.com/Azure/azure-container-networking/hack/acncli/api"
6+
c "github.com/Azure/azure-container-networking/tools/acncli/api"
77
"github.com/nxadm/tail"
88
"github.com/spf13/cobra"
99
"github.com/spf13/viper"

0 commit comments

Comments
 (0)