fix: argocd resource configuration (#1580)

Co-authored-by: jeho <[email protected]>

Author: merll

core.yaml

@@ -146,8 +146,6 @@ adminApps:
         namespace: argocd
         type: public
         auth: true
-        # removeRequestHeaders:
-        #   - authorization
   - name: cert-manager
     tags: [ingress, security, tls]
   - name: cnpg

helmfile.d/snippets/defaults.yaml

@@ -10,10 +10,10 @@ environments:
           argocd:
             enabled: true
             autoscaling:
-              enabled: false
+              enabled: true
               minReplicas: 1
-              maxReplicas: 3
-              targetCPUUtilizationPercentage: 50
+              maxReplicas: 5
+              targetCPUUtilizationPercentage: 70
           cert-manager:
             issuer: custom-ca
             resources:

values/argocd/argocd.gotmpl

@@ -1,4 +1,5 @@
 {{- $v := .Values }}
+{{- $a := $v.apps.argocd }}
 {{- $k := $v.apps.keycloak }}
 global:
   domain: argocd.{{ $v.cluster.domainSuffix }}
@@ -21,14 +22,22 @@ applicationSet:
 
 controller:
   autoscaling:
-    enabled: true
+    enabled: {{ $a.autoscaling.enabled }}
+    maxReplicas: {{ $a.autoscaling.maxReplicas }}
+    minReplicas: {{ $a.autoscaling.minReplicas }}
+    targetCPUUtilizationPercentage: {{ $a.autoscaling.targetCPUUtilizationPercentage }}
+
   resources:
+    {{- with $a | get "resources.controller" nil }}
+      {{- toYaml .| nindent 4 }}
+    {{- else }}
     limits:
       cpu: 1
-      memory: 1Gi
+      memory: 2Gi
     requests:
       cpu: 100m
-      memory: 256M
+      memory: 1Gi
+    {{- end }}  
 dex:
   enabled: false
 notifications:
@@ -43,32 +52,52 @@ notifications:
       memory: 256M
 redis:
   resources:
+    {{- with $a | get "resources.redis" nil }}
+      {{- toYaml .| nindent 4 }}
+    {{- else }}
     limits:
       cpu: 1
       memory: 1Gi
     requests:
       cpu: 100m
       memory: 256M
+    {{- end }}
 repoServer:
   autoscaling:
-    enabled: true
+    enabled: {{ $a.autoscaling.enabled }}
+    maxReplicas: {{ $a.autoscaling.maxReplicas }}
+    minReplicas: {{ $a.autoscaling.minReplicas }}
+    targetCPUUtilizationPercentage: {{ $a.autoscaling.targetCPUUtilizationPercentage }}
+
   resources:
+    {{- with $a | get "resources.repo" nil }}
+      {{- toYaml .| nindent 4 }}
+    {{- else }}
     limits:
       cpu: 1
       memory: 1Gi
     requests:
       cpu: 100m
       memory: 256M
+    {{- end }}  
 server:
   autoscaling:
-    enabled: true
+    enabled: {{ $a.autoscaling.enabled }}
+    maxReplicas: {{ $a.autoscaling.maxReplicas }}
+    minReplicas: {{ $a.autoscaling.minReplicas }}
+    targetCPUUtilizationPercentage: {{ $a.autoscaling.targetCPUUtilizationPercentage }}
+
   resources:
+    {{- with $a | get "resources.server" nil }}
+      {{- toYaml .| nindent 4 }}
+    {{- else }}
     limits:
       cpu: 1
       memory: 1Gi
     requests:
       cpu: 100m
       memory: 256M
+    {{- end }}  
 configs:
   # General Argo CD configuration
   ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/argocd-cm.yaml
@@ -80,6 +109,8 @@ configs:
     statusbadge.enabled: "false"
     url: https://argocd.{{ $v.cluster.domainSuffix }}
     users.anonymous.enabled: "false"
+    # Note that the clientSecret is not actually used
+    # as for now oauth2-proxy handles the login
     oidc.config: |
       name: Otomi
       issuer: {{ $v._derived.oidcBaseUrl }}
@@ -103,7 +134,7 @@ configs:
 
   secret:
     extra:
-      clientSecret: {{ $k.idp.clientSecret | b64enc }}
+      oidc.clientSecret: {{ $k.idp.clientSecret }}
   params:
     server.insecure: true # nginx terminates tls
 

versions.yaml

@@ -1,4 +1,4 @@
-api: 2.8.0
+api: fix-argocd-resource-values
 console: 2.7.0
 tasks: 2.4.0
 tools: 1.6.4