Skip to content

Commit d2ba9bb

Browse files
matmerrUbuntu
andauthored
IPv6 Node IPAM (#532)
* switch to go mod * pull node spec from apiserver * carve v6 addresses * address pool * update go mod vendor * build image * build image * build image * separate go mod for npm * add manager ipv6 ipam test * added comments and addressed feedback * address comments * address comments * address comments * check if loaded * address comments * update pipeline * update pipeline * update test message Co-authored-by: Ubuntu <azureuser@k8s-agentpool1-23761303-0.2w0jm2xwiahebmp33klngrlq1d.xx.internal.cloudapp.net>
1 parent dc1ecbf commit d2ba9bb

File tree

2,150 files changed

+1210
-857456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,150 files changed

+1210
-857456
lines changed

.pipelines/e2e-step-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ steps:
8484
export CLUSTER_DEFINITION=./'${{ parameters.clusterDefinition }}'
8585
export ORCHESTRATOR=kubernetes
8686
export CREATE_VNET=false
87-
export TIMEOUT=10m
87+
export TIMEOUT=20m
8888
export CLIENT_ID=$(AKS_ENGINE_CLIENT_ID)
8989
export CLIENT_SECRET=$(AKS_ENGINE_CLIENT_SECRET)
9090
export TENANT_ID=$(AKS_ENGINE_TENANT_ID)

.pipelines/pipeline.yaml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ stages:
1717
demands: agent.os -equals Linux
1818

1919
container:
20-
image: containernetworking/pipeline-ci:1.0.6
20+
image: "$(BUILD_IMAGE)" # build image set as variable in pipeline runtime for flexibility
2121
options: "--privileged"
2222

2323
# Go setup for the vmImage:
@@ -68,7 +68,7 @@ stages:
6868
go get github.com/jstemmer/go-junit-report
6969
go get github.com/axw/gocov/gocov
7070
go get github.com/AlekSi/gocov-xml
71-
go get -u gopkg.in/matm/v1/gocov-html
71+
go get github.com/matm/gocov-html
7272
workingDirectory: "$(modulePath)"
7373
name: "GoDependencies"
7474
displayName: "Install Go dependencies"
@@ -80,19 +80,24 @@ stages:
8080
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
8181
export GOOS=linux
8282
make all-binaries VERSION=$(EnvironmentalVariables.Tag)
83+
workingDirectory: "$(modulePath)"
84+
name: "Build"
85+
displayName: "Build"
86+
87+
- script: |
8388
sudo make azure-npm-image VERSION=$(EnvironmentalVariables.Tag)
8489
echo '$(DOCKER_PASSWORD)' | docker login containernetworking.azurecr.io -u '$(DOCKER_USERNAME)' --password-stdin
8590
docker tag $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag) $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
8691
docker push $PUSH_CONTAINER_REGISTRY/azure-npm:$(EnvironmentalVariables.Tag)-test
87-
cd output
88-
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
89-
sudo find . -mindepth 2 -type f -print -exec mv {} . \;
90-
sudo rm -R -- */
9192
workingDirectory: "$(modulePath)"
92-
name: "Build"
93-
displayName: "Build"
93+
name: "PushImages"
94+
displayName: "PushNPMImage"
9495
9596
- bash: |
97+
cd ./output
98+
sudo find . -mindepth 2 -type f -regextype posix-extended ! -iregex '.*\.(zip|tgz)$' -delete
99+
sudo find . -mindepth 2 -type f -print -exec mv {} . \;
100+
sudo rm -R -- */ && cd ..
96101
# run test, echo exit status code to fd 3, pipe output from test to tee, which splits output to stdout and go-junit-report (which converts test output to report.xml), stdout from tee is redirected to fd 4. Take output written to fd 3 (which is the exit code of test), redirect to stdout, pipe to read from stdout then exit with that status code. Read all output from fd 4 (output from tee) and write to top stdout
97102
{ { { {
98103
sudo -E env "PATH=$PATH" make test-all;
@@ -168,11 +173,12 @@ stages:
168173
az storage blob upload-batch -d acn-$(EnvironmentalVariables.CommitHash) -s ./output/ --account-name $(STORAGE_ACCOUNT_NAME)
169174
workingDirectory: "$(modulePath)"
170175
displayName: Create artifact storage container
176+
condition: succeeded()
171177

172178
- template: e2e-job-template.yaml
173179
parameters:
174180
name: "ubuntu_16_04_linux_e2e"
175-
pipelineBuildImage: "containernetworking/pipeline-ci:1.0.6"
181+
pipelineBuildImage: "$(BUILD_IMAGE)"
176182
clusterDefinition: "cniLinux1604.json"
177183
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
178184
clusterDefinitionCniBuildOS: "linux"
@@ -181,7 +187,7 @@ stages:
181187
- template: e2e-job-template.yaml
182188
parameters:
183189
name: "ubuntu_18_04_linux_e2e"
184-
pipelineBuildImage: "containernetworking/pipeline-ci:1.0.6"
190+
pipelineBuildImage: "$(BUILD_IMAGE)"
185191
clusterDefinition: "cniLinux1804.json"
186192
clusterDefinitionCniTypeKey: "azureCNIURLLinux"
187193
clusterDefinitionCniBuildOS: "linux"
@@ -190,7 +196,7 @@ stages:
190196
- template: e2e-job-template.yaml
191197
parameters:
192198
name: "windows_18_09_e2e"
193-
pipelineBuildImage: "containernetworking/pipeline-ci:1.0.6"
199+
pipelineBuildImage: "$(BUILD_IMAGE)"
194200
clusterDefinition: "cniWindows1809.json"
195201
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
196202
clusterDefinitionCniBuildOS: "windows"
@@ -199,22 +205,20 @@ stages:
199205
- template: e2e-job-template.yaml
200206
parameters:
201207
name: "windows_19_03_e2e"
202-
pipelineBuildImage: "containernetworking/pipeline-ci:1.0.6"
208+
pipelineBuildImage: "$(BUILD_IMAGE)"
203209
clusterDefinition: "cniWindows1903.json"
204210
clusterDefinitionCniTypeKey: "azureCNIURLWindows"
205211
clusterDefinitionCniBuildOS: "windows"
206212
clusterDefinitionCniBuildExt: ".zip"
207213

208214
- stage: cleanup
209-
condition: always()
210215
jobs:
211216
- job: delete_remote_artifacts
212217
pool:
213218
name: Networking-ContainerNetworking
214219
demands: agent.os -equals Linux
215220
container:
216-
image: containernetworking/pipeline-ci:1.0.6
217-
condition: always()
221+
image: "$(BUILD_IMAGE)"
218222
steps:
219223
- task: AzureCLI@1
220224
inputs:
@@ -226,4 +230,3 @@ stages:
226230
az storage container delete -n acn-$CommitHash --account-name $(STORAGE_ACCOUNT_NAME)
227231
workingDirectory: "$(modulePath)"
228232
displayName: Cleanup remote Azure storage container
229-
condition: always()

0 commit comments

Comments
 (0)