Added support for resource requirements in GitOpsService

Signed-off-by: Anand Francis Joseph <[email protected]>

Author: anandf

api/v1alpha1/gitopsservice_types.go

@@ -32,6 +32,9 @@ type GitopsServiceSpec struct {
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 	// NodeSelector is a map of key value pairs used for node selection in the default workloads
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
+	// Resources defines the Compute Resources required by the console-plugin and gitops-backend pods.
+	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
 // GitopsServiceStatus defines the observed state of GitopsService

controllers/consoleplugin.go

@@ -286,6 +286,10 @@ func (r *ReconcileGitopsService) reconcileDeployment(cr *pipelinesv1alpha1.Gitop
 		newPluginDeployment.Spec.Template.Spec.Tolerations = cr.Spec.Tolerations
 	}
 
+	if cr.Spec.Resources != nil {
+		newPluginDeployment.Spec.Template.Spec.Resources = cr.Spec.Resources
+	}
+
 	// Check if this Deployment already exists
 	existingPluginDeployment := &appsv1.Deployment{}
 

controllers/gitopsservice_controller.go

@@ -622,6 +622,11 @@ func (r *ReconcileGitopsService) reconcileBackend(gitopsserviceNamespacedName ty
 		if len(instance.Spec.Tolerations) > 0 {
 			deploymentObj.Spec.Template.Spec.Tolerations = instance.Spec.Tolerations
 		}
+
+		if instance.Spec.Resources != nil {
+			deploymentObj.Spec.Template.Spec.Resources = instance.Spec.Resources
+		}
+
 		// Check if this Deployment already exists
 		found := &appsv1.Deployment{}
 		if err := r.Client.Get(context.TODO(), types.NamespacedName{Name: deploymentObj.Name, Namespace: deploymentObj.Namespace},

controllers/gitopsservice_controller_test.go

@@ -741,6 +741,52 @@ func TestReconcile_PSSLabels(t *testing.T) {
 	}
 }
 
+func TestReconcile_Resources(t *testing.T) {
+	logf.SetLogger(argocd.ZapLogger(true))
+	s := scheme.Scheme
+	addKnownTypesToScheme(s)
+	gitopsService := &pipelinesv1alpha1.GitopsService{
+		ObjectMeta: v1.ObjectMeta{
+			Name: serviceName,
+		},
+		Spec: pipelinesv1alpha1.GitopsServiceSpec{
+			RunOnInfra:  true,
+			Tolerations: deploymentDefaultTolerations(),
+			Resources: &corev1.ResourceRequirements{
+				Requests: corev1.ResourceList{
+					corev1.ResourceCPU:    resourcev1.MustParse("100m"),
+					corev1.ResourceMemory: resourcev1.MustParse("64Mi"),
+				},
+				Limits: corev1.ResourceList{
+					corev1.ResourceCPU:    resourcev1.MustParse("200m"),
+					corev1.ResourceMemory: resourcev1.MustParse("128Mi"),
+				},
+			},
+		},
+	}
+	fakeClient := fake.NewFakeClient(gitopsService)
+	reconciler := newReconcileGitOpsService(fakeClient, s)
+
+	_, err := reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
+	assertNoError(t, err)
+
+	deployment := appsv1.Deployment{}
+	err = fakeClient.Get(context.TODO(), types.NamespacedName{Name: serviceName, Namespace: serviceNamespace}, &deployment)
+	assertNoError(t, err)
+	nSelector := common.InfraNodeSelector()
+	argoutil.AppendStringMap(nSelector, argocommon.DefaultNodeSelector())
+	assert.DeepEqual(t, deployment.Spec.Template.Spec.NodeSelector, nSelector)
+	assert.DeepEqual(t, deployment.Spec.Template.Spec.Tolerations, deploymentDefaultTolerations())
+	assert.DeepEqual(t, deployment.Spec.Template.Spec.Resources.Requests, corev1.ResourceList{
+		corev1.ResourceCPU:    resourcev1.MustParse("100m"),
+		corev1.ResourceMemory: resourcev1.MustParse("64Mi"),
+	})
+	assert.DeepEqual(t, deployment.Spec.Template.Spec.Resources.Limits, corev1.ResourceList{
+		corev1.ResourceCPU:    resourcev1.MustParse("200m"),
+		corev1.ResourceMemory: resourcev1.MustParse("128Mi"),
+	})
+}
+
 func addKnownTypesToScheme(scheme *runtime.Scheme) {
 	scheme.AddKnownTypes(configv1.GroupVersion, &configv1.ClusterVersion{})
 	scheme.AddKnownTypes(pipelinesv1alpha1.GroupVersion, &pipelinesv1alpha1.GitopsService{})