Merge branch 'master' into feature/dashboard-storage

Author: ewoutp

manifests/templates/deployment/service.yaml

@@ -1,4 +1,4 @@
-apiVersion: ""
+apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Deployment.OperatorDeploymentName }}

pkg/util/k8sutil/pods.go

@@ -449,7 +449,9 @@ func CreateArangodPod(kubecli kubernetes.Interface, developmentMode bool, deploy
 	p.Spec.Containers = append(p.Spec.Containers, c)
 
 	// Add UUID init container
-	p.Spec.InitContainers = append(p.Spec.InitContainers, arangodInitContainer("uuid", id, engine, alpineImage, requireUUID))
+	if alpineImage != "" {
+		p.Spec.InitContainers = append(p.Spec.InitContainers, arangodInitContainer("uuid", id, engine, alpineImage, requireUUID))
+	}
 
 	// Add volume
 	if pvcName != "" {

tests/change_args_test.go

@@ -41,6 +41,7 @@ import (
 // TestChangeArgsAgents tests the creating of an active failover deployment
 // with default settings and once ready changes the arguments of the agents.
 func TestChangeArgsAgents(t *testing.T) {
+	longOrSkip(t)
 	c := client.MustNewInCluster()
 	kubecli := mustNewKubeClient(t)
 	ns := getNamespace(t)
@@ -119,6 +120,7 @@ func TestChangeArgsAgents(t *testing.T) {
 // TestChangeArgsDBServer tests the creating of a cluster deployment
 // with default settings and once ready changes the arguments of the dbservers.
 func TestChangeArgsDBServer(t *testing.T) {
+	longOrSkip(t)
 	c := client.MustNewInCluster()
 	kubecli := mustNewKubeClient(t)
 	ns := getNamespace(t)