Merge branch 'master' into operator-split

Author: ewoutp

Makefile

@@ -50,10 +50,10 @@ ifndef DEPLOYMENTNAMESPACE
 endif
 
 ifndef OPERATORIMAGE
-	OPERATORIMAGE := $(DOCKERNAMESPACE)/arangodb-operator$(IMAGESUFFIX)
+	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
 endif
 ifndef TESTIMAGE
-	TESTIMAGE := $(DOCKERNAMESPACE)/arangodb-operator-test$(IMAGESUFFIX)
+	TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
 endif
 ifndef ENTERPRISEIMAGE
 	ENTERPRISEIMAGE := $(DEFAULTENTERPRISEIMAGE)

scripts/kube_run_tests.sh

@@ -16,4 +16,4 @@ kubectl --namespace ${DEPLOYMENTNAMESPACE} \
     --env="ENTERPRISEIMAGE=${ENTERPRISEIMAGE}" \
     --env="TEST_NAMESPACE=${DEPLOYMENTNAMESPACE}" \
     -- \
-    -test.v -test.timeout $TESTTIMEOUT $TESTLENGTHOPTIONS
+    -test.v -test.timeout $TESTTIMEOUT $TESTLENGTHOPTIONS $TESTOPTIONS