Set image pull policy only if defined (#228)

minio · Aug 2, 2020 · 9dbaad8 · 9dbaad8
1 parent 58c924d
commit 9dbaad8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/pkg/resources/jobs/kes-job.go b/pkg/resources/jobs/kes-job.go
@@ -82,14 +82,17 @@ func NewForKES(t *miniov1.Tenant) *batchv1.Job {
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: kesMetadata(t),
 				Spec: corev1.PodSpec{
-					RestartPolicy:    miniov1.KESJobRestartPolicy,
-					Containers:       containers,
-					ImagePullSecrets: []corev1.LocalObjectReference{t.Spec.ImagePullSecret},
-					Volumes:          podVolumes,
+					RestartPolicy: miniov1.KESJobRestartPolicy,
+					Containers:    containers,
+					Volumes:       podVolumes,
 				},
 			},
 		},
 	}
+	// Address issue https://github.com/kubernetes/kubernetes/issues/85332
+	if t.Spec.ImagePullSecret.Name != "" {
+		d.Spec.Template.Spec.ImagePullSecrets = []corev1.LocalObjectReference{t.Spec.ImagePullSecret}
+	}
 
 	return d
 }

diff --git a/pkg/resources/statefulsets/kes-statefulset.go b/pkg/resources/statefulsets/kes-statefulset.go
@@ -167,15 +167,18 @@ func NewForKES(t *miniov1.Tenant, serviceName string) *appsv1.StatefulSet {
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: KESMetadata(t),
 				Spec: corev1.PodSpec{
-					Containers:       containers,
-					Volumes:          podVolumes,
-					ImagePullSecrets: []corev1.LocalObjectReference{t.Spec.ImagePullSecret},
-					RestartPolicy:    corev1.RestartPolicyAlways,
-					SchedulerName:    t.Scheduler.Name,
+					Containers:    containers,
+					Volumes:       podVolumes,
+					RestartPolicy: corev1.RestartPolicyAlways,
+					SchedulerName: t.Scheduler.Name,
 				},
 			},
 		},
 	}
+	// Address issue https://github.com/kubernetes/kubernetes/issues/85332
+	if t.Spec.ImagePullSecret.Name != "" {
+		ss.Spec.Template.Spec.ImagePullSecrets = []corev1.LocalObjectReference{t.Spec.ImagePullSecret}
+	}
 
 	return ss
 }