Skip to content

Commit 4a6e160

Browse files
committed
adding AKS tutorial
2 parents 8e70e64 + 94d7ae8 commit 4a6e160

39 files changed

+586
-236
lines changed

Jenkinsfile.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def buildTestSteps(Map myParams, String kubeConfigRoot, String kubeconfig) {
8787
"DEPLOYMENTNAMESPACE=${myParams.TESTNAMESPACE}-${env.GIT_COMMIT}",
8888
"DOCKERNAMESPACE=${myParams.DOCKERNAMESPACE}",
8989
"ENTERPRISEIMAGE=${myParams.ENTERPRISEIMAGE}",
90+
"ARANGODIMAGE=${myParams.ARANGODIMAGE}",
9091
"IMAGETAG=jenkins-test",
9192
"KUBECONFIG=${kubeConfigRoot}/${kubeconfig}",
9293
"LONG=${myParams.LONG ? 1 : 0}",
@@ -129,7 +130,8 @@ pipeline {
129130
string(name: 'DOCKERNAMESPACE', defaultValue: 'arangodb', description: 'DOCKERNAMESPACE sets the docker registry namespace in which the operator docker image will be pushed', )
130131
string(name: 'KUBECONFIGS', defaultValue: 'kube-ams1,scw-183a3b', description: 'KUBECONFIGS is a comma separated list of Kubernetes configuration files (relative to /home/jenkins/.kube) on which the tests are run', )
131132
string(name: 'TESTNAMESPACE', defaultValue: 'jenkins', description: 'TESTNAMESPACE sets the kubernetes namespace to ru tests in (this must be short!!)', )
132-
string(name: 'ENTERPRISEIMAGE', defaultValue: '', description: 'ENTERPRISEIMAGE sets the docker image used for enterprise tests)', )
133+
string(name: 'ENTERPRISEIMAGE', defaultValue: '', description: 'ENTERPRISEIMAGE sets the docker image used for enterprise tests', )
134+
string(name: 'ARANGODIMAGE', defaultValue: '', description: 'ARANGODIMAGE sets the docker image used for tests (except enterprise and update tests)', )
133135
string(name: 'TESTOPTIONS', defaultValue: '', description: 'TESTOPTIONS is used to pass additional test options to the integration test', )
134136
}
135137
stages {

Makefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ GOVERSION := 1.10.0-alpine
2727
PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
2828
GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
2929

30-
DOCKERFILE := Dockerfile
30+
DOCKERFILE := Dockerfile
3131
DOCKERTESTFILE := Dockerfile.test
3232
DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
3333

34-
ifndef LOCALONLY
34+
ifndef LOCALONLY
3535
PUSHIMAGES := 1
3636
IMAGESHA256 := true
3737
else
3838
IMAGESHA256 := false
3939
endif
4040

41-
ifdef IMAGETAG
41+
ifdef IMAGETAG
4242
IMAGESUFFIX := :$(IMAGETAG)
43-
else
43+
else
4444
IMAGESUFFIX := :dev
4545
endif
4646

@@ -84,8 +84,8 @@ TESTBINNAME := $(PROJECT)_test
8484
TESTBIN := $(BINDIR)/$(TESTBINNAME)
8585
DURATIONTESTBINNAME := $(PROJECT)_duration_test
8686
DURATIONTESTBIN := $(BINDIR)/$(DURATIONTESTBINNAME)
87-
RELEASE := $(GOBUILDDIR)/bin/release
88-
GHRELEASE := $(GOBUILDDIR)/bin/github-release
87+
RELEASE := $(GOBUILDDIR)/bin/release
88+
GHRELEASE := $(GOBUILDDIR)/bin/github-release
8989

9090
TESTLENGTHOPTIONS := -test.short
9191
TESTTIMEOUT := 20m
@@ -94,7 +94,7 @@ ifeq ($(LONG), 1)
9494
TESTTIMEOUT := 180m
9595
endif
9696
ifdef VERBOSE
97-
TESTVERBOSEOPTIONS := -v
97+
TESTVERBOSEOPTIONS := -v
9898
endif
9999

100100
SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
@@ -176,7 +176,7 @@ update-vendor:
176176
# Manually restore arangosync vendor with: git checkout deps/github.com/arangodb/arangosync
177177

178178
.PHONY: update-generated
179-
update-generated: $(GOBUILDDIR)
179+
update-generated: $(GOBUILDDIR)
180180
@docker build $(SRCDIR)/tools/codegen --build-arg GOVERSION=$(GOVERSION) -t k8s-codegen
181181
docker run \
182182
--rm \
@@ -232,7 +232,7 @@ ifdef PUSHIMAGES
232232
docker push $(OPERATORIMAGE)
233233
endif
234234

235-
# Manifests
235+
# Manifests
236236

237237
.PHONY: manifests
238238
manifests: $(GOBUILDDIR)
@@ -268,7 +268,7 @@ run-unit-tests: $(GOBUILDDIR) $(SOURCES)
268268
$(REPOPATH)/pkg/util/k8sutil \
269269
$(REPOPATH)/pkg/util/k8sutil/test \
270270
$(REPOPATH)/pkg/util/probe \
271-
$(REPOPATH)/pkg/util/validation
271+
$(REPOPATH)/pkg/util/validation
272272

273273
$(TESTBIN): $(GOBUILDDIR) $(SOURCES)
274274
@mkdir -p $(BINDIR)
@@ -304,7 +304,7 @@ endif
304304
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
305305
kubectl apply -f $(MANIFESTPATHTEST)
306306
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
307-
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
307+
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" "$(ENTERPRISEIMAGE)" $(TESTTIMEOUT) $(TESTLENGTHOPTIONS)
308308

309309
$(DURATIONTESTBIN): $(GOBUILDDIR) $(SOURCES)
310310
@mkdir -p $(BINDIR)
@@ -376,20 +376,20 @@ $(RELEASE): $(GOBUILDDIR) $(SOURCES) $(GHRELEASE)
376376
.PHONY: build-ghrelease
377377
build-ghrelease: $(GHRELEASE)
378378

379-
$(GHRELEASE): $(GOBUILDDIR)
379+
$(GHRELEASE): $(GOBUILDDIR)
380380
GOPATH=$(GOBUILDDIR) go build -o $(GHRELEASE) github.com/aktau/github-release
381381

382382
.PHONY: release-patch
383383
release-patch: $(RELEASE)
384-
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
384+
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
385385

386386
.PHONY: release-minor
387387
release-minor: $(RELEASE)
388388
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=minor
389389

390390
.PHONY: release-major
391391
release-major: $(RELEASE)
392-
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
392+
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
393393

394394
## Kubernetes utilities
395395

@@ -410,4 +410,4 @@ redeploy-operator: delete-operator manifests
410410
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
411411
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
412412
kubectl apply -f $(MANIFESTPATHTEST)
413-
kubectl get pods
413+
kubectl get pods

0 commit comments

Comments
 (0)