fix: Rolling update pod of Redis HA Proxy are being in pending state when HA enabled cluster has Only 3 worker nodes (#1933)

* fix: redis ha proxy rolling update pod in pending state

Signed-off-by: akhil nittala <[email protected]>

* fix: redis ha proxy rolling update pod in pending state

Signed-off-by: akhil nittala <[email protected]>

* fix: redis ha proxy rolling update pod in pending state

Signed-off-by: akhil nittala <[email protected]>

* fix: redis ha proxy rolling update pod in pending state

Signed-off-by: akhil nittala <[email protected]>

---------

Signed-off-by: akhil nittala <[email protected]>

Author: akhilnittala

controllers/argocd/deployment.go

@@ -610,7 +610,12 @@ func (r *ReconcileArgoCD) reconcileRedisDeployment(cr *argoproj.ArgoCD, useTLS b
 // reconcileRedisHAProxyDeployment will ensure the Deployment resource is present for the Redis HA Proxy component.
 func (r *ReconcileArgoCD) reconcileRedisHAProxyDeployment(cr *argoproj.ArgoCD) error {
 	deploy := newDeploymentWithSuffix("redis-ha-haproxy", "redis", cr)
-
+	deploy.Spec.Strategy = appsv1.DeploymentStrategy{
+		Type: appsv1.RollingUpdateDeploymentStrategyType,
+		RollingUpdate: &appsv1.RollingUpdateDeployment{
+			MaxSurge: &intstr.IntOrString{IntVal: 0},
+		},
+	}
 	var redisEnv = append(proxyEnvVars(), corev1.EnvVar{
 		Name: "AUTH",
 		ValueFrom: &corev1.EnvVarSource{
@@ -885,6 +890,14 @@ func (r *ReconcileArgoCD) reconcileRedisHAProxyDeployment(cr *argoproj.ArgoCD) e
 			explanation += "pod security context"
 			changed = true
 		}
+		if !reflect.DeepEqual(deploy.Spec.Strategy, existing.Spec.Strategy) {
+			existing.Spec.Strategy = deploy.Spec.Strategy
+			if changed {
+				explanation += ", "
+			}
+			explanation += "deployment strategy"
+			changed = true
+		}
 		if changed {
 			argoutil.LogResourceUpdate(log, existing, "updating", explanation)
 			return r.Update(context.TODO(), existing)

controllers/argocd/deployment_test.go

@@ -874,6 +874,7 @@ func TestReconcileArgoCD_reconcileDeployments_HA_proxy_with_resources(t *testing
 	}
 	assert.Equal(t, deployment.Spec.Template.Spec.Containers[0].Resources, testResources)
 	assert.Equal(t, deployment.Spec.Template.Spec.InitContainers[0].Resources, testResources)
+	assert.Equal(t, deployment.Spec.Strategy.RollingUpdate.MaxSurge, &intstr.IntOrString{IntVal: 0})
 
 	// test resource is Updated on reconciliation
 	newResources := corev1.ResourceRequirements{
@@ -899,6 +900,8 @@ func TestReconcileArgoCD_reconcileDeployments_HA_proxy_with_resources(t *testing
 
 	assert.Equal(t, deployment.Spec.Template.Spec.Containers[0].Resources, newResources)
 	assert.Equal(t, deployment.Spec.Template.Spec.InitContainers[0].Resources, newResources)
+	assert.Equal(t, deployment.Spec.Strategy.RollingUpdate.MaxSurge, &intstr.IntOrString{IntVal: 0})
+
 }
 func TestReconcileArgoCD_reconcileRedisHAProxyDeployment_ModifyContainerSpec(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))

tests/ginkgo/sequential/1-020_validate_redis_ha_nonha_test.go

@@ -36,6 +36,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
@@ -158,6 +159,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
 
 			depl = &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: argoCDInstance.Name + "-redis-ha-haproxy", Namespace: ns.Name}}
 			Eventually(depl, "2m", "5s").Should(deploymentFixture.HaveReadyReplicas(3))
+			Expect(depl.Spec.Strategy.RollingUpdate.MaxSurge).To(Equal(&intstr.IntOrString{IntVal: 0}))
 
 			haProxyContainer := deploymentFixture.GetTemplateSpecContainerByName("haproxy", *depl)