Do not keep orphaned replicaset fro function managed deployments (#820)

kyma-project · Mar 14, 2024 · 8476bf3 · 8476bf3
1 parent 60b1a49
commit 8476bf3
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/components/serverless/internal/controllers/serverless/deployment_test.go b/components/serverless/internal/controllers/serverless/deployment_test.go
@@ -12,6 +12,9 @@ import (
 )
 
 func TestFunctionReconciler_equalDeployments(t *testing.T) {
+
+	ten := int32(10)
+	zero := int32(0)
 	type args struct {
 		existing       appsv1.Deployment
 		expected       appsv1.Deployment
@@ -454,6 +457,22 @@ func TestFunctionReconciler_equalDeployments(t *testing.T) {
 			},
 			want: false,
 		},
+		{
+			name: "different revision history limit",
+			args: args{
+				existing: appsv1.Deployment{
+					Spec: appsv1.DeploymentSpec{
+						RevisionHistoryLimit: &ten,
+					},
+				},
+				expected: appsv1.Deployment{
+					Spec: appsv1.DeploymentSpec{
+						RevisionHistoryLimit: &zero,
+					},
+				},
+			},
+			want: false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1021,9 +1040,11 @@ func TestFunctionReconciler_isDeploymentReady(t *testing.T) {
 }
 
 func fixDeploymentWithReplicas(replicas int32) appsv1.Deployment {
+	zero := int32(0)
 	return appsv1.Deployment{
 		Spec: appsv1.DeploymentSpec{
-			Replicas: &replicas,
+			RevisionHistoryLimit: &zero,
+			Replicas:             &replicas,
 			Template: corev1.PodTemplateSpec{
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{}},

diff --git a/components/serverless/internal/controllers/serverless/system_state.go b/components/serverless/internal/controllers/serverless/system_state.go
@@ -518,14 +518,16 @@ func (s *systemState) buildDeployment(cfg buildDeploymentArgs, resourceConfig Re
 	}
 	enrichPodSpecWithSecurityContext(&templateSpec, functionUser, functionUserGroup)
 
+	zero := int32(0)
 	return appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: fmt.Sprintf("%s-", s.instance.GetName()),
 			Namespace:    s.instance.GetNamespace(),
 			Labels:       s.functionLabels(),
 		},
 		Spec: appsv1.DeploymentSpec{
-			Replicas: s.getReplicas(DefaultDeploymentReplicas),
+			RevisionHistoryLimit: &zero,
+			Replicas:             s.getReplicas(DefaultDeploymentReplicas),
 			Selector: &metav1.LabelSelector{
 				MatchLabels: s.deploymentSelectorLabels(), // this has to match spec.template.objectmeta.Labels
 				// and also it has to be immutable

diff --git a/components/serverless/internal/controllers/serverless/utils.go b/components/serverless/internal/controllers/serverless/utils.go
@@ -222,6 +222,7 @@ func equalDeployments(existing appsv1.Deployment, expected appsv1.Deployment) bo
 
 	result = result && mapsEqual(existing.Spec.Template.GetAnnotations(), expected.Spec.Template.GetAnnotations())
 	result = result && equalSecretMounts(existing.Spec.Template.Spec, expected.Spec.Template.Spec)
+	result = result && equalInt32Pointer(existing.Spec.RevisionHistoryLimit, expected.Spec.RevisionHistoryLimit)
 	return result
 }