Skip to content

ignore sequence changes in container env vars #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m-terra merged 1 commit into from
May 13, 2026
Merged

ignore sequence changes in container env vars #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions controllers/instance/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,21 +301,34 @@ func compileEnvVars(instance *proxyv1alpha1.Instance) []corev1.EnvVar {
for k, v := range instance.Spec.Env {
envVars = append(envVars, corev1.EnvVar{Name: k, Value: v})
}

sort.Slice(envVars, func(i, j int) bool {
return envVars[i].Name < envVars[j].Name
})
return envVars
}

func needsUpdate(oldStatefulSet, newStatefulSet *appsv1.StatefulSet) bool {
oldCpy := oldStatefulSet.DeepCopy()
newCpy := newStatefulSet.DeepCopy()

normalizeEnvs(oldCpy)
normalizeEnvs(newCpy)

removeIrrelevantProperties(oldCpy)
removeIrrelevantProperties(newCpy)

return !equality.Semantic.DeepEqual(oldCpy.Spec, newCpy.Spec) || !equality.Semantic.DeepEqual(oldCpy.OwnerReferences, newCpy.OwnerReferences)
return !equality.Semantic.DeepEqual(oldCpy.Spec, newCpy.Spec) ||
!equality.Semantic.DeepEqual(oldCpy.OwnerReferences, newCpy.OwnerReferences)
}

func normalizeEnvs(statefulSet *appsv1.StatefulSet) {
for ii := range statefulSet.Spec.Template.Spec.Containers {
sort.Slice(statefulSet.Spec.Template.Spec.Containers[ii].Env, func(i, j int) bool {
return statefulSet.Spec.Template.Spec.Containers[ii].Env[i].Name < statefulSet.Spec.Template.Spec.Containers[ii].Env[j].Name
})
}
for ii := range statefulSet.Spec.Template.Spec.InitContainers {
sort.Slice(statefulSet.Spec.Template.Spec.InitContainers[ii].Env, func(i, j int) bool {
return statefulSet.Spec.Template.Spec.InitContainers[ii].Env[i].Name < statefulSet.Spec.Template.Spec.InitContainers[ii].Env[j].Name
})
}
}

func removeIrrelevantProperties(ss *appsv1.StatefulSet) {
Expand Down
5 changes: 5 additions & 0 deletions controllers/instance/statefulset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ var _ = Describe("Reconcile", Label("controller"), func() {
},
},
Labels: labels,
Env: map[string]string{
"WATCH_PATH": "/a/b",
"SHUTDOWN_WAIT": "15m",
},
},
}

Expand All @@ -87,6 +91,7 @@ var _ = Describe("Reconcile", Label("controller"), func() {
" then echo 'timeout waiting for IP 10.158.182.27, aborting'\n exit 1\n fi\n echo 'waiting for IP 10.158.182.27 to be assigned...'\n" +
" sleep 5\n done\n\n echo 'IP 10.158.182.27 assignment verified, waiting 5 seconds before continuing...'\n\n" +
" sleep 5\n\n echo -n \"BIND_ADDRESS=10.158.182.27\" > /var/lib/haproxy/run/env\n cat /var/lib/haproxy/run/env\n exit 0\nfi\n\nexit 1\n"))
Ω(statefulSet.Spec.Template.Spec.Containers[0].Env).Should(HaveLen(4))
})

It("update only on spec change", func() {
Expand Down