From 4adec5cbf5efc8a711516a54c5b21072f85ca9f8 Mon Sep 17 00:00:00 2001
From: lamai93 <lars@arangodb.com>
Date: Tue, 5 Mar 2019 09:57:21 +0100
Subject: [PATCH] Added MY_NODE_NAME and NODE_NAME envs for all pods.

---
 pkg/util/constants/constants.go |  9 +++++----
 pkg/util/k8sutil/pods.go        | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkg/util/constants/constants.go b/pkg/util/constants/constants.go
index b515f98ee..adce5f1b0 100644
--- a/pkg/util/constants/constants.go
+++ b/pkg/util/constants/constants.go
@@ -23,10 +23,11 @@
 package constants
 
 const (
-	EnvOperatorNodeName     = "MY_NODE_NAME"
-	EnvOperatorPodName      = "MY_POD_NAME"
-	EnvOperatorPodNamespace = "MY_POD_NAMESPACE"
-	EnvOperatorPodIP        = "MY_POD_IP"
+	EnvOperatorNodeName       = "MY_NODE_NAME"
+	EnvOperatorNodeNameArango = "NODE_NAME"
+	EnvOperatorPodName        = "MY_POD_NAME"
+	EnvOperatorPodNamespace   = "MY_POD_NAMESPACE"
+	EnvOperatorPodIP          = "MY_POD_IP"
 
 	EnvArangoLicenseKey          = "ARANGO_LICENSE_KEY"          // Contains the License Key for the Docker Image
 	EnvArangodJWTSecret          = "ARANGOD_JWT_SECRET"          // Contains JWT secret for the ArangoDB cluster
diff --git a/pkg/util/k8sutil/pods.go b/pkg/util/k8sutil/pods.go
index 37c60d4ad..a1afb8da6 100644
--- a/pkg/util/k8sutil/pods.go
+++ b/pkg/util/k8sutil/pods.go
@@ -360,6 +360,22 @@ func newLifecycle() (*v1.Lifecycle, []v1.EnvVar, []v1.Volume, error) {
 				},
 			},
 		},
+		v1.EnvVar{
+			Name: constants.EnvOperatorNodeName,
+			ValueFrom: &v1.EnvVarSource{
+				FieldRef: &v1.ObjectFieldSelector{
+					FieldPath: "spec.nodeName",
+				},
+			},
+		},
+		v1.EnvVar{
+			Name: constants.EnvOperatorNodeNameArango,
+			ValueFrom: &v1.EnvVarSource{
+				FieldRef: &v1.ObjectFieldSelector{
+					FieldPath: "spec.nodeName",
+				},
+			},
+		},
 	}
 	vols := []v1.Volume{
 		v1.Volume{