diff --git a/pkg/splunk/controller/util.go b/pkg/splunk/controller/util.go index 85db31534..fdc34e258 100644 --- a/pkg/splunk/controller/util.go +++ b/pkg/splunk/controller/util.go @@ -149,6 +149,15 @@ func MergePodSpecUpdates(current *corev1.PodSpec, revised *corev1.PodSpec, name result = true } + // check Env + if splcommon.CompareEnvs(current.Containers[idx].Env, revised.Containers[idx].Env) { + scopedLog.Info("Pod Container Env differ", + "current", current.Containers[idx].Env, + "revised", revised.Containers[idx].Env) + current.Containers[idx].Env = revised.Containers[idx].Env + result = true + } + // check VolumeMounts if splcommon.CompareVolumeMounts(current.Containers[idx].VolumeMounts, revised.Containers[idx].VolumeMounts) { scopedLog.Info("Pod Container VolumeMounts differ", diff --git a/pkg/splunk/controller/util_test.go b/pkg/splunk/controller/util_test.go index 66b47fe06..e01f8345f 100644 --- a/pkg/splunk/controller/util_test.go +++ b/pkg/splunk/controller/util_test.go @@ -102,6 +102,11 @@ func TestMergePodUpdates(t *testing.T) { matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) } podUpdateTester("Container Ports") + // check container different Env + revised.Spec.Containers[0].Env = []corev1.EnvVar{{Name: "A", Value: "ab"}} + matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) } + podUpdateTester("Container Env") + // check container different VolumeMounts revised.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{{Name: "mnt-spark"}} matcher = func() bool { return reflect.DeepEqual(current.Spec.Containers, revised.Spec.Containers) }