From 2c0d8fac02eb5646249aa2afe6ee25bf81bc9924 Mon Sep 17 00:00:00 2001
From: Howard Lau <howardlau1999@hotmail.com>
Date: Thu, 29 Oct 2020 09:03:30 +0000
Subject: [PATCH] fix

Signed-off-by: Howard Lau <howardlau1999@hotmail.com>
---
 controllers/controller_filer_statefulset.go  | 29 ++------------------
 controllers/controller_master_statefulset.go |  2 +-
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/controllers/controller_filer_statefulset.go b/controllers/controller_filer_statefulset.go
index 6305016..8bf3641 100644
--- a/controllers/controller_filer_statefulset.go
+++ b/controllers/controller_filer_statefulset.go
@@ -33,33 +33,8 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1
 	filerPodSpec.Containers = []corev1.Container{{
 		Name:            "seaweedfs",
 		Image:           m.Spec.Image,
-		ImagePullPolicy: corev1.PullIfNotPresent,
-		Env: []corev1.EnvVar{
-			{
-				Name: "POD_IP",
-				ValueFrom: &corev1.EnvVarSource{
-					FieldRef: &corev1.ObjectFieldSelector{
-						FieldPath: "status.podIP",
-					},
-				},
-			},
-			{
-				Name: "POD_NAME",
-				ValueFrom: &corev1.EnvVarSource{
-					FieldRef: &corev1.ObjectFieldSelector{
-						FieldPath: "metadata.name",
-					},
-				},
-			},
-			{
-				Name: "NAMESPACE",
-				ValueFrom: &corev1.EnvVarSource{
-					FieldRef: &corev1.ObjectFieldSelector{
-						FieldPath: "metadata.namespace",
-					},
-				},
-			},
-		},
+		ImagePullPolicy: m.BaseFilerSpec().ImagePullPolicy(),
+		Env:             append(m.BaseFilerSpec().Env(), kubernetesEnvVars...),
 		Command: []string{
 			"/bin/sh",
 			"-ec",
diff --git a/controllers/controller_master_statefulset.go b/controllers/controller_master_statefulset.go
index 9aae2c7..6276ec9 100644
--- a/controllers/controller_master_statefulset.go
+++ b/controllers/controller_master_statefulset.go
@@ -22,7 +22,7 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv
 	masterPodSpec.Containers = []corev1.Container{{
 		Name:            "seaweedfs",
 		Image:           m.Spec.Image,
-		ImagePullPolicy: corev1.PullIfNotPresent,
+		ImagePullPolicy: m.BaseMasterSpec().ImagePullPolicy(),
 		Env:             append(m.BaseMasterSpec().Env(), kubernetesEnvVars...),
 		Command: []string{
 			"/bin/sh",