Merge remote-tracking branch 'origin/master' into bug-fix/scale-up-error

Author: lamai93

Makefile

@@ -27,20 +27,20 @@ GOVERSION := 1.10.0-alpine
 PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
 GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
 
-DOCKERFILE := Dockerfile 
+DOCKERFILE := Dockerfile
 DOCKERTESTFILE := Dockerfile.test
 DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
 
-ifndef LOCALONLY 
+ifndef LOCALONLY
 	PUSHIMAGES := 1
 	IMAGESHA256 := true
 else
 	IMAGESHA256 := false
 endif
 
-ifdef IMAGETAG 
+ifdef IMAGETAG
 	IMAGESUFFIX := :$(IMAGETAG)
-else 
+else
 	IMAGESUFFIX := :dev
 endif
 
@@ -84,8 +84,8 @@ TESTBINNAME := $(PROJECT)_test
 TESTBIN := $(BINDIR)/$(TESTBINNAME)
 DURATIONTESTBINNAME := $(PROJECT)_duration_test
 DURATIONTESTBIN := $(BINDIR)/$(DURATIONTESTBINNAME)
-RELEASE := $(GOBUILDDIR)/bin/release 
-GHRELEASE := $(GOBUILDDIR)/bin/github-release 
+RELEASE := $(GOBUILDDIR)/bin/release
+GHRELEASE := $(GOBUILDDIR)/bin/github-release
 
 TESTLENGTHOPTIONS := -test.short
 TESTTIMEOUT := 20m
@@ -94,7 +94,7 @@ ifeq ($(LONG), 1)
 	TESTTIMEOUT := 180m
 endif
 ifdef VERBOSE
-	TESTVERBOSEOPTIONS := -v 
+	TESTVERBOSEOPTIONS := -v
 endif
 
 SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
@@ -176,7 +176,7 @@ update-vendor:
 	# Manually restore arangosync vendor with: git checkout deps/github.com/arangodb/arangosync
 
 .PHONY: update-generated
-update-generated: $(GOBUILDDIR) 
+update-generated: $(GOBUILDDIR)
 	@docker build $(SRCDIR)/tools/codegen --build-arg GOVERSION=$(GOVERSION) -t k8s-codegen
 	docker run \
 		--rm \
@@ -232,7 +232,7 @@ ifdef PUSHIMAGES
 	docker push $(OPERATORIMAGE)
 endif
 
-# Manifests 
+# Manifests
 
 .PHONY: manifests
 manifests: $(GOBUILDDIR)
@@ -268,7 +268,7 @@ run-unit-tests: $(GOBUILDDIR) $(SOURCES)
 			$(REPOPATH)/pkg/util/k8sutil \
 			$(REPOPATH)/pkg/util/k8sutil/test \
 			$(REPOPATH)/pkg/util/probe \
-			$(REPOPATH)/pkg/util/validation 
+			$(REPOPATH)/pkg/util/validation
 
 $(TESTBIN): $(GOBUILDDIR) $(SOURCES)
 	@mkdir -p $(BINDIR)
@@ -376,20 +376,20 @@ $(RELEASE): $(GOBUILDDIR) $(SOURCES) $(GHRELEASE)
 .PHONY: build-ghrelease
 build-ghrelease: $(GHRELEASE)
 
-$(GHRELEASE): $(GOBUILDDIR) 
+$(GHRELEASE): $(GOBUILDDIR)
 	GOPATH=$(GOBUILDDIR) go build -o $(GHRELEASE) github.com/aktau/github-release
 
 .PHONY: release-patch
 release-patch: $(RELEASE)
-	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch 
+	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=patch
 
 .PHONY: release-minor
 release-minor: $(RELEASE)
 	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=minor
 
 .PHONY: release-major
 release-major: $(RELEASE)
-	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major 
+	GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
 
 ## Kubernetes utilities
 
@@ -410,4 +410,4 @@ redeploy-operator: delete-operator manifests
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
 	kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
 	kubectl apply -f $(MANIFESTPATHTEST)
-	kubectl get pods 
+	kubectl get pods

docs/design/acceptance_test.md

@@ -472,3 +472,62 @@ Remove the collections with the replication factor of 1
 
 - [ ] The remaining `Pods` running on the `Node` must be restarted on another `Node`
 - [ ] After the `Pods` have restarted, the server must have the same data, except for the removed collections, and be responsive again
+
+### Test 7a: Test DC2DC on 2 clusters, running in the same Kubernetes cluster
+
+This test requires the use of the enterprise image.
+
+Create 2 `ArangoDeployment` of mode `Cluster` and dc2dc enabled.
+
+Hint: Derive from `tests/acceptance/cluster-sync.yaml`, name the deployments `cluster1` and `cluster2`.
+
+Make sure to include a name ('cluster1-to-2`) for an external access package.
+
+```yaml
+apiVersion: "database.arangodb.com/v1alpha"
+kind: "ArangoDeployment"
+metadata:
+  name: "cluster1"
+spec:
+  mode: Cluster
+  image: ewoutp/arangodb:3.3.14
+  sync:
+    enabled: true
+    externalAccess:
+      accessPackageSecretNames: ["cluster1-to-2"]
+```
+
+- [ ] The deployments must start
+- [ ] The deployments must yield 15 `Pods`
+- [ ] The deployments must yield a `Service` named `cluster[1|2]`
+- [ ] The deployments must yield a `Service` named `cluster[1|2]-ea`
+- [ ] The deployments must yield a `Service` named `cluster[1|2]-sync`
+- [ ] The `Services` named `cluster[1|2]-ea` must be accessible from outside (LoadBalancer or NodePort) and show WebUI
+
+Create an `ArangoDeploymentReplication` from `tests/acceptance/cluster12-replication.yaml`.
+
+It will take some time until the synchronization (from `cluster1` to `cluster2`) is configured.
+
+- [ ] The status of the `cluster12-replication` resource shows ....
+- [ ] The webUI of `cluster1` shows that you can create a new collection there.
+- [ ] The webUI of `cluster2` shows that you cannot create a new collection there.
+
+Create a collection named `testcol` with a replication factor 2 and 3 shards (using the webUI of `cluster1`).
+
+- [ ] The webUI of `cluster2` shows collection `testcol` with the given replication factor and number of shards.
+
+Create multiple documents in the collection named `testcol` (using the webUI of `cluster1`).
+
+- [ ] The documents are visible in webUI of `cluster2`.
+
+Modify multiple documents in the collection named `testcol` (using the webUI of `cluster1`).
+
+- [ ] The modified documents are visible in webUI of `cluster2`.
+
+Remove one or more documents from the collection named `testcol` (using the webUI of `cluster1`).
+
+- [ ] The documents are no longer visible in webUI of `cluster2`.
+
+Create a new database called `db2` (using the webUI of `cluster1`).
+
+- [ ] The webUI of `cluster2` shows database `db2`.

examples/cluster1-with-sync.yaml

@@ -4,7 +4,7 @@ metadata:
   name: "cluster1-with-sync"
 spec:
   mode: Cluster
-  image: ewoutp/arangodb:3.3.8
+  image: arangodb/arangodb:3.3.17
   tls:
     altNames: ["kube-01", "kube-02", "kube-03"]
   sync:

examples/cluster2-with-sync.yaml

@@ -4,7 +4,7 @@ metadata:
   name: "cluster2-with-sync"
 spec:
   mode: Cluster
-  image: ewoutp/arangodb:3.3.8
+  image: arangodb/arangodb:3.3.17
   tls:
     altNames: ["kube-01", "kube-02", "kube-03"]
   sync:

examples/production-cluster.yaml

@@ -4,5 +4,5 @@ metadata:
   name: "production-cluster"
 spec:
   mode: Cluster
-  image: arangodb/arangodb:3.3.10
+  image: arangodb/arangodb:3.3.17
   environment: Production

examples/simple-cluster.yaml

@@ -4,4 +4,4 @@ metadata:
   name: "example-simple-cluster"
 spec:
   mode: Cluster
-  image: arangodb/arangodb:3.3.10
+  image: arangodb/arangodb:3.3.17

examples/single-server.yaml

@@ -4,4 +4,4 @@ metadata:
   name: "example-simple-single"
 spec:
   mode: Single
-  image: arangodb/arangodb-preview:3.3
+  image: arangodb/arangodb:3.3.17

pkg/deployment/resources/pod_creator.go

@@ -375,10 +375,6 @@ func (r *Resources) createReadinessProbe(spec api.DeploymentSpec, group api.Serv
 		InitialDelaySeconds: 2,
 		PeriodSeconds:       2,
 	}
-	switch spec.GetMode() {
-	case api.DeploymentModeActiveFailover:
-		probeCfg.LocalPath = "/_admin/echo"
-	}
 	return probeCfg, nil
 }
 

tests/acceptance/.gitignore

@@ -0,0 +1,3 @@
+cluster1.yaml
+cluster2.yaml
+generated

tests/acceptance/activefailover.template.yaml

@@ -0,0 +1,10 @@
+apiVersion: "database.arangodb.com/v1alpha"
+kind: "ArangoDeployment"
+metadata:
+  name: "acceptance-activefailover"
+spec:
+  environment: @ENVIRONMENT@
+  image: @IMAGE@
+  externalAccess:
+    type: LoadBalancer
+  mode: ActiveFailover