Skip to content

chore: update tools directory and CNI+CNS deployments manifests #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2021
Merged

chore: update tools directory and CNI+CNS deployments manifests #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cns/azure-cns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions hack/README.md
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions tools/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# NOTICE:

## **Tools in this directory are provided as is.**

### Thanks,
### Azure Container Networking Dev Team
0 hack/acncli/.dockerignore → tools/acncli/.dockerignore
View file
Open in desktop
File renamed without changes.
0 hack/acncli/Dockerfile → tools/acncli/Dockerfile
View file
Open in desktop
File renamed without changes.
0 hack/acncli/api/constants.go → tools/acncli/api/constants.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions hack/acncli/cmd/install.go → tools/acncli/cmd/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion hack/acncli/cmd/logs.go → tools/acncli/cmd/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 hack/acncli/cmd/manager.go → tools/acncli/cmd/manager.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hack/acncli/cmd/root.go → tools/acncli/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion hack/acncli/deployment/manager.yaml → tools/acncli/deployment/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/acncli/installer/conflist.go → tools/acncli/installer/conflist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hack/acncli/installer/install.go → tools/acncli/installer/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion hack/acncli/installer/utils.go → tools/acncli/installer/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions hack/acncli/main.go → tools/acncli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down