From 415799e00d09ac09e45b32e828f260813462f7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20LELEV=C3=89?= <b.leleve@hexa.solutions>
Date: Fri, 22 Oct 2021 22:53:51 +0200
Subject: [PATCH 1/2] Add missing POD_NAME environment variable for the Spilo
 Pod

---
 pkg/cluster/k8sres.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index 366570c3c..06b560f68 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -692,6 +692,15 @@ func (c *Cluster) generateSpiloPodEnvVars(uid types.UID, spiloConfiguration stri
 				},
 			},
 		},
+		{
+			Name: "POD_NAME",
+			ValueFrom: &v1.EnvVarSource{
+				FieldRef: &v1.ObjectFieldSelector{
+					APIVersion: "v1",
+					FieldPath:  "metadata.name",
+				},
+			},
+		},
 		{
 			Name: "POD_NAMESPACE",
 			ValueFrom: &v1.EnvVarSource{

From cc1b876f1d7885f2162ccca3d458626833427c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20LELEV=C3=89?= <b.leleve@hexa.solutions>
Date: Mon, 25 Oct 2021 14:19:52 +0200
Subject: [PATCH 2/2] Fix envIndex on TestGenerateSpiloPodEnvVars()

---
 pkg/cluster/k8sres_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/cluster/k8sres_test.go b/pkg/cluster/k8sres_test.go
index 0f99d5f31..619c57e0d 100644
--- a/pkg/cluster/k8sres_test.go
+++ b/pkg/cluster/k8sres_test.go
@@ -132,17 +132,17 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
 
 	expectedValuesGSBucket := []ExpectedValue{
 		ExpectedValue{
-			envIndex:       15,
+			envIndex:       16,
 			envVarConstant: "WAL_GS_BUCKET",
 			envVarValue:    "wale-gs-bucket",
 		},
 		ExpectedValue{
-			envIndex:       16,
+			envIndex:       17,
 			envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",
 			envVarValue:    "/SomeUUID",
 		},
 		ExpectedValue{
-			envIndex:       17,
+			envIndex:       18,
 			envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "",
 		},
@@ -150,22 +150,22 @@ func TestGenerateSpiloPodEnvVars(t *testing.T) {
 
 	expectedValuesGCPCreds := []ExpectedValue{
 		ExpectedValue{
-			envIndex:       15,
+			envIndex:       16,
 			envVarConstant: "WAL_GS_BUCKET",
 			envVarValue:    "wale-gs-bucket",
 		},
 		ExpectedValue{
-			envIndex:       16,
+			envIndex:       17,
 			envVarConstant: "WAL_BUCKET_SCOPE_SUFFIX",
 			envVarValue:    "/SomeUUID",
 		},
 		ExpectedValue{
-			envIndex:       17,
+			envIndex:       18,
 			envVarConstant: "WAL_BUCKET_SCOPE_PREFIX",
 			envVarValue:    "",
 		},
 		ExpectedValue{
-			envIndex:       18,
+			envIndex:       19,
 			envVarConstant: "GOOGLE_APPLICATION_CREDENTIALS",
 			envVarValue:    "some_path_to_credentials",
 		},