chore: operator should not revert readiness and liveness prob configu…

…rations (#1743) Signed-off-by: Anatolii Bazko <[email protected]>
eclipse-che · Aug 16, 2023 · ea78a2c · ea78a2c
1 parent f59c387
commit ea78a2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pkg/common/utils/env.go b/pkg/common/utils/env.go
@@ -15,6 +15,7 @@ import (
 	"os"
 	"regexp"
 	"runtime"
+	"sort"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -60,6 +61,11 @@ func doGetEnvsByRegExp(regExp string, isArchitectureDependentEnvNameNeeded bool)
 			env = append(env, corev1.EnvVar{Name: envName, Value: pair[1]})
 		}
 	}
+
+	sort.Slice(env, func(i, j int) bool {
+		return strings.Compare(env[i].Name, env[j].Name) < 0
+	})
+
 	return env
 }
 

diff --git a/pkg/deploy/deployment.go b/pkg/deploy/deployment.go
@@ -43,7 +43,7 @@ var DefaultDeploymentDiffOpts = cmp.Options{
 	cmpopts.IgnoreFields(appsv1.Deployment{}, "TypeMeta", "ObjectMeta", "Status"),
 	cmpopts.IgnoreFields(appsv1.DeploymentSpec{}, "Replicas", "RevisionHistoryLimit", "ProgressDeadlineSeconds"),
 	cmpopts.IgnoreFields(appsv1.DeploymentStrategy{}, "RollingUpdate"),
-	cmpopts.IgnoreFields(corev1.Container{}, "TerminationMessagePath", "TerminationMessagePolicy", "SecurityContext"),
+	cmpopts.IgnoreFields(corev1.Container{}, "ReadinessProbe", "LivenessProbe", "TerminationMessagePath", "TerminationMessagePolicy", "SecurityContext"),
 	cmpopts.IgnoreFields(corev1.PodSpec{}, "DNSPolicy", "SchedulerName", "SecurityContext", "DeprecatedServiceAccount"),
 	cmpopts.IgnoreFields(corev1.ConfigMapVolumeSource{}, "DefaultMode"),
 	cmpopts.IgnoreFields(corev1.SecretVolumeSource{}, "DefaultMode"),