feat: Allow setting ARGOCD_EXEC_TIMEOUT in repo server (#415)

* feat: Allow setting ARGOCD_EXEC_TIMEOUT in repo server * Generate CRDs
argoproj-labs · Aug 31, 2021 · 2da7728 · 2da7728
1 parent 0c338e8
commit 2da7728
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 1 deletion.
diff --git a/api/v1alpha1/argocd_types.go b/api/v1alpha1/argocd_types.go
@@ -346,6 +346,9 @@ type ArgoCDRepoSpec struct {
 
 	// Version is the ArgoCD Repo Server container image tag.
 	Version string `json:"version,omitempty"`
+
+	// ExecTimeout specifies the timeout in seconds for tool execution
+	ExecTimeout *int `json:"execTimeout,omitempty"`
 }
 
 // ArgoCDRouteSpec defines the desired state for an OpenShift Route.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml
@@ -705,6 +705,10 @@ spec:
                       can currently be: - openshift - Use the OpenShift service CA
                       to request TLS config'
                     type: string
+                  execTimeout:
+                    description: ExecTimeout specifies the timeout in seconds for
+                      tool execution
+                    type: integer
                   image:
                     description: Image is the ArgoCD Repo Server container image.
                     type: string

diff --git a/controllers/argocd/deployment.go b/controllers/argocd/deployment.go
@@ -785,6 +785,11 @@ func (r *ReconcileArgoCD) reconcileRepoDeployment(cr *argoprojv1a1.ArgoCD) error
 		deploy.Spec.Template.Spec.ServiceAccountName = cr.Spec.Repo.ServiceAccount
 	}
 
+	repoEnv := proxyEnvVars()
+	if cr.Spec.Repo.ExecTimeout != nil {
+		repoEnv = append(repoEnv, corev1.EnvVar{Name: "ARGOCD_EXEC_TIMEOUT", Value: fmt.Sprintf("%d", *cr.Spec.Repo.ExecTimeout)})
+	}
+
 	deploy.Spec.Template.Spec.Containers = []corev1.Container{{
 		Command:         getArgoRepoCommand(cr),
 		Image:           getRepoServerContainerImage(cr),
@@ -798,7 +803,7 @@ func (r *ReconcileArgoCD) reconcileRepoDeployment(cr *argoprojv1a1.ArgoCD) error
 			InitialDelaySeconds: 5,
 			PeriodSeconds:       10,
 		},
-		Env:  proxyEnvVars(),
+		Env:  repoEnv,
 		Name: "argocd-repo-server",
 		Ports: []corev1.ContainerPort{
 			{

diff --git a/controllers/argocd/deployment_test.go b/controllers/argocd/deployment_test.go
@@ -111,6 +111,59 @@ func TestReconcileArgoCD_reconcileRepoDeployment_volumes(t *testing.T) {
 	}
 }
 
+func TestReconcileArgoCD_reconcileRepoDeployment_env(t *testing.T) {
+	t.Run("ExecTimeout set", func(t *testing.T) {
+		logf.SetLogger(ZapLogger(true))
+		a := makeTestArgoCD()
+		timeout := 600
+		a.Spec.Repo.ExecTimeout = &timeout
+		r := makeTestReconciler(t, a)
+
+		err := r.reconcileRepoDeployment(a)
+		assert.NilError(t, err)
+		deployment := &appsv1.Deployment{}
+		err = r.Client.Get(context.TODO(), types.NamespacedName{
+			Name:      "argocd-repo-server",
+			Namespace: testNamespace,
+		}, deployment)
+		assert.NilError(t, err)
+
+		found := false
+		for _, e := range deployment.Spec.Template.Spec.Containers[0].Env {
+			if e.Name == "ARGOCD_EXEC_TIMEOUT" && e.Value == "600" {
+				found = true
+				break
+			}
+		}
+
+		assert.Equal(t, found, true)
+	})
+	t.Run("ExecTimeout not set", func(t *testing.T) {
+		logf.SetLogger(ZapLogger(true))
+		a := makeTestArgoCD()
+		r := makeTestReconciler(t, a)
+
+		err := r.reconcileRepoDeployment(a)
+		assert.NilError(t, err)
+		deployment := &appsv1.Deployment{}
+		err = r.Client.Get(context.TODO(), types.NamespacedName{
+			Name:      "argocd-repo-server",
+			Namespace: testNamespace,
+		}, deployment)
+		assert.NilError(t, err)
+
+		found := false
+		for _, e := range deployment.Spec.Template.Spec.Containers[0].Env {
+			if e.Name == "ARGOCD_EXEC_TIMEOUT" && e.Value == "600" {
+				found = true
+				break
+			}
+		}
+
+		assert.Equal(t, found, false)
+	})
+}
+
 // reconcileRepoDeployment creates a Deployment with the correct mounts for the
 // repo-server.
 func TestReconcileArgoCD_reconcileRepoDeployment_mounts(t *testing.T) {