Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/splunk/controller/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions pkg/splunk/controller/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down