From 74f093752f33d4719ea54e8c1fbb3f191d5c036c Mon Sep 17 00:00:00 2001
From: Ewout Prangsma <ewout@prangsma.net>
Date: Mon, 28 May 2018 14:41:18 +0200
Subject: [PATCH 1/3] Make image ID pod work on openshift

---
 pkg/deployment/images.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/deployment/images.go b/pkg/deployment/images.go
index d441eb80f..c5cd69c17 100644
--- a/pkg/deployment/images.go
+++ b/pkg/deployment/images.go
@@ -167,6 +167,8 @@ func (ib *imagesBuilder) fetchArangoDBImageIDAndVersion(ctx context.Context, ima
 	args := []string{
 		"--server.authentication=false",
 		fmt.Sprintf("--server.endpoint=tcp://[::]:%d", k8sutil.ArangoPort),
+		"--database.directory=" + k8sutil.ArangodVolumeMountDir,
+		"--log.output=+",
 	}
 	terminationGracePeriod := time.Second * 30
 	tolerations := make([]v1.Toleration, 0, 2)

From 4cbb6c428ecf1f21f98ba736a99323ead5dc328e Mon Sep 17 00:00:00 2001
From: Ewout Prangsma <ewout@prangsma.net>
Date: Mon, 28 May 2018 14:42:10 +0200
Subject: [PATCH 2/3] Leave BlockOwnerDeletion untouched

---
 pkg/apis/deployment/v1alpha/deployment.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/apis/deployment/v1alpha/deployment.go b/pkg/apis/deployment/v1alpha/deployment.go
index a47b63278..7c2fba55b 100644
--- a/pkg/apis/deployment/v1alpha/deployment.go
+++ b/pkg/apis/deployment/v1alpha/deployment.go
@@ -52,12 +52,13 @@ type ArangoDeployment struct {
 func (d *ArangoDeployment) AsOwner() metav1.OwnerReference {
 	trueVar := true
 	return metav1.OwnerReference{
-		APIVersion:         SchemeGroupVersion.String(),
-		Kind:               ArangoDeploymentResourceKind,
-		Name:               d.Name,
-		UID:                d.UID,
-		Controller:         &trueVar,
-		BlockOwnerDeletion: &trueVar,
+		APIVersion: SchemeGroupVersion.String(),
+		Kind:       ArangoDeploymentResourceKind,
+		Name:       d.Name,
+		UID:        d.UID,
+		Controller: &trueVar,
+		// For now BlockOwnerDeletion does not work on OpenShift, so we leave it out.
+		//BlockOwnerDeletion: &trueVar,
 	}
 }
 

From fdc250c035039fec98efedaad787267b7ed64c6a Mon Sep 17 00:00:00 2001
From: Ewout Prangsma <ewout@prangsma.net>
Date: Mon, 28 May 2018 14:42:18 +0200
Subject: [PATCH 3/3] Typo

---
 manifests/templates/deployment/rbac.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/templates/deployment/rbac.yaml b/manifests/templates/deployment/rbac.yaml
index 6568ef80a..b9362d931 100644
--- a/manifests/templates/deployment/rbac.yaml
+++ b/manifests/templates/deployment/rbac.yaml
@@ -38,7 +38,7 @@ rules:
 
 ---
 
-## Bind the cluster role granting access to ArangoLocalStorage resources
+## Bind the cluster role granting access to ArangoDeployment resources
 ## to the default service account of the configured namespace.
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding