From d36e9d34eda6b76086a3d1e421b16f491c6884f3 Mon Sep 17 00:00:00 2001 From: Ewout Prangsma Date: Tue, 10 Jul 2018 10:10:49 +0200 Subject: [PATCH 1/3] Do not build initcontainer for imageid pod --- pkg/util/k8sutil/pods.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/util/k8sutil/pods.go b/pkg/util/k8sutil/pods.go index aa7779098..46a5f8550 100644 --- a/pkg/util/k8sutil/pods.go +++ b/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 != "" { From cd9203b95d6348c29d074a4aa8007dabe1cf2308 Mon Sep 17 00:00:00 2001 From: Ewout Prangsma Date: Tue, 10 Jul 2018 10:49:20 +0200 Subject: [PATCH 2/3] Fixed apiVersion --- manifests/templates/deployment/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/templates/deployment/service.yaml b/manifests/templates/deployment/service.yaml index 25dd0b1f2..e7cc83a68 100644 --- a/manifests/templates/deployment/service.yaml +++ b/manifests/templates/deployment/service.yaml @@ -1,4 +1,4 @@ -apiVersion: "" +apiVersion: v1 kind: Service metadata: name: {{ .Deployment.OperatorDeploymentName }} From 101982f5c2c60f4038dc17ad021130b2fa0176f6 Mon Sep 17 00:00:00 2001 From: Ewout Prangsma Date: Tue, 10 Jul 2018 11:11:15 +0200 Subject: [PATCH 3/3] Change-args tests are long --- tests/change_args_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/change_args_test.go b/tests/change_args_test.go index 05855c3a0..96dfd6dd0 100644 --- a/tests/change_args_test.go +++ b/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)