reenable the swift e2e pipeline

.github/workflows/cyclonus-netpol-test.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.16'
+          go-version: '^1.17'
 
       - name: Setup Kind
         uses: engineerd/setup-kind@v0.5.0

.github/workflows/repo-hygiene.yaml

@@ -12,7 +12,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-latest]
     name: Lint
     runs-on: ${{ matrix.os }}

.pipelines/Dockerfile

@@ -11,7 +11,7 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" | sudo tee -a
 RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
 RUN echo "deb http://archive.ubuntu.com/ubuntu/ bionic main" | sudo tee -a /etc/apt/sources.list
 RUN apt-get update && apt-get install -y iptables ipset iproute2 ebtables 
-RUN wget -qO- https://golang.org/dl/go1.16.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
+RUN wget -qO- https://golang.org/dl/go1.17.linux-amd64.tar.gz | tar zxf - -C /usr/lib/
 ENV PATH="/usr/lib/go/bin/:${PATH}"
 ENV GOROOT="/usr/lib/go"
 ENV GOPATH="/root/go"

.pipelines/pipeline.yaml

@@ -21,7 +21,6 @@ stages:
               BUILD_NUMBER=$(Build.BuildNumber)
               echo "##vso[task.setvariable variable=StorageID;isOutput=true]$(echo ${BUILD_NUMBER//./-})"
               echo "##vso[task.setvariable variable=Tag;isOutput=true]$(git describe --tags --always --dirty)"
-              echo "##vso[task.setvariable variable=ImageTag;isOutput=true]$(git describe --tags --always --dirty)-test"
               sudo chown -R $(whoami):$(whoami) .
               go version
               go env
@@ -117,8 +116,8 @@ stages:
             displayName: "Image Vulnerability Scan"
 
           - script: |
-              docker tag $IMAGE_REGISTRY/azure-cni-manager:$(TAG) $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
-              docker push $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
+              docker tag $IMAGE_REGISTRY/azure-cni-manager:$(TAG) $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
+              docker push $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
 
               function auto-retry()
               {
@@ -132,7 +131,7 @@ stages:
 
               auto-retry docker pull $IMAGE_REGISTRY/azure-npm:$(TAG)
               auto-retry docker pull $IMAGE_REGISTRY/azure-cns:$(TAG)
-              auto-retry docker pull $IMAGE_REGISTRY/azure-cni-manager:$(TAG)-test
+              auto-retry docker pull $IMAGE_REGISTRY/azure-cni-manager:$(TAG)
             name: "mcrreplication"
             displayName: "Push NPM Image and Wait for Repository"
 
@@ -199,11 +198,11 @@ stages:
             displayName: "Publish Code Coverage Results"
             condition: always()
 
-  #- template: singletenancy/aks-swift/e2e-job-template.yaml
-  #  parameters:
-  #    name: "aks_on_swift_e2e"
-  #    displayName: AKS on Swift
-  #    pipelineBuildImage: "$(BUILD_IMAGE)"
+  - template: singletenancy/aks-swift/e2e-job-template.yaml
+    parameters:
+      name: "aks_swift_e2e"
+      displayName: AKS Swift
+      pipelineBuildImage: "$(BUILD_IMAGE)"
 
   - template: singletenancy/aks-engine/e2e-job-template.yaml
     parameters:
@@ -238,7 +237,7 @@ stages:
   - stage: cleanup
     displayName: Cleanup
     dependsOn:
-     # - "aks_on_swift_e2e"
+      - "aks_swift_e2e"
       - "ubuntu_16_04_linux_e2e"
       - "ubuntu_18_04_linux_e2e"
       - "windows_19_03_e2e"

.pipelines/singletenancy/aks-swift/e2e-job-template.yaml

@@ -9,19 +9,17 @@ stages:
     dependsOn: build_and_test
     jobs:
       - job: ${{ parameters.name }}
-        displayName: Singletenancy AKS on Swift Suite - (${{ parameters.name }})
+        displayName: Singletenancy AKS Swift Suite - (${{ parameters.name }})
         timeoutInMinutes: 120
         pool:
           name: "$(BUILD_POOL_NAME_SWIFT)"
           demands: 
           - agent.os -equals Linux
           - Role -equals $(CUSTOM_E2E_ROLE)
-        container:
-          image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibilit
         variables:
           GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
           GOBIN: "$(GOPATH)/bin" # Go binaries path
-          ImageTag: $[ stagedependencies.build_and_test.setup.outputs['EnvironmentalVariables.ImageTag'] ]
+          Tag: $[ stagedependencies.build_and_test.setup.outputs['EnvironmentalVariables.Tag'] ]
           modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
         steps:
           - template: e2e-step-template.yaml

.pipelines/singletenancy/aks-swift/e2e-step-template.yaml

@@ -21,7 +21,7 @@ steps:
     displayName: "Set up the Go environment"
 
   - bash: |
-      echo $(ImageTag)
+      echo $(Tag)
     displayName: Echo Tag
 
   - task: AzureCLI@1
@@ -34,7 +34,7 @@ steps:
         echo "DNC Underlay config"
         az keyvault secret show --name $(KV_DNC_UNDERLAY_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//'
         az keyvault secret show --name $(KV_DNC_UNDERLAY_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//' > ~/.kube/dnc-underlay
-        echo "Dirty ACN cx cluster config"
+        echo "Dirty ACN ccp config"
         az keyvault secret show --name $(KV_AKS_SWIFT_CX_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//'
         az keyvault secret show --name $(KV_AKS_SWIFT_CX_SECRET_NAME) --vault-name $(KV_NAME) --query value | sed 's/\\n/\n/g' | sed -e 's/^"//' -e 's/"$//' > ~/.kube/config
     displayName: Pull Kubeconfig from Keyvault
@@ -48,7 +48,7 @@ steps:
       sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       kubectl cluster-info
       kubectl get po -owide -A
-      sudo -E env "PATH=$PATH" VERSION=$(ImageTag) INSTALL_CNI=true INSTALL_CNS=true make test-integration
+      sudo -E env "PATH=$PATH" VERSION=$(Tag) INSTALL_CNI=true INSTALL_CNS=true make test-integration
     name: "aksswifte2e"
     displayName: "Run AKS Swift E2E"
 
@@ -80,4 +80,4 @@ steps:
       sudo rm -rf test/integration/logs
     name: "Cleanupartifactdir"
     displayName: "Cleanup artifact dir"
-    condition: always()
+    condition: always()

Dockerfile.build

@@ -1,4 +1,4 @@
-FROM golang:1.10
+FROM golang:1.17
 
 RUN apt-get update \
  && apt-get install -y zip \

build/tools/go.mod

@@ -1,6 +1,6 @@
 module github.com/azure/azure-container-networking/build/tools
 
-go 1.16
+go 1.17
 
 require (
 	github.com/AlekSi/gocov-xml v0.0.0-20190121064608-3a14fb1c4737

go.mod

@@ -1,6 +1,6 @@
 module github.com/Azure/azure-container-networking
 
-go 1.16
+go 1.17
 
 require (
 	code.cloudfoundry.org/clock v1.0.0 // indirect
@@ -30,6 +30,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
+	github.com/vishvananda/netlink v1.1.0 // indirect
 	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
 	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
@@ -46,6 +47,60 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 )
 
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/containerd/cgroups v1.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/evanphx/json-patch v4.11.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v0.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/hpcloud/tail v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/moby/spdystream v0.2.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
+	golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	gopkg.in/fsnotify.v1 v1.4.7 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/component-base v0.22.1 // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+)
+
 replace (
 	github.com/Microsoft/go-winio => github.com/microsoft/go-winio v0.4.17
 	github.com/Microsoft/hcsshim => github.com/microsoft/hcsshim v0.8.22