Improve reposerver

README.md

@@ -36,6 +36,7 @@ This chart is used to set up the basic building blocks in [Validated Patterns](h
 |-----|------|---------|-------------|
 | clusterGroup.applications | object | `{}` |  |
 | clusterGroup.argoCD.configManagementPlugins | list | `[]` |  |
+| clusterGroup.argoCD.env | list | `[]` |  |
 | clusterGroup.argoCD.initContainers | list | `[]` |  |
 | clusterGroup.argoCD.resourceExclusions | string | `"- apiGroups:\n  - tekton.dev\n  kinds:\n  - TaskRun\n  - PipelineRun\n"` |  |
 | clusterGroup.argoCD.resourceHealthChecks[0].check | string | `"hs = {}\nif obj.status ~= nil then\n  if obj.status.phase ~= nil then\n    if obj.status.phase == \"Pending\" then\n      hs.status = \"Healthy\"\n      hs.message = obj.status.phase\n      return hs\n    elseif obj.status.phase == \"Bound\" then\n      hs.status = \"Healthy\"\n      hs.message = obj.status.phase\n      return hs\n    end\n  end\nend\nhs.status = \"Progressing\"\nhs.message = \"Waiting for PVC\"\nreturn hs\n"` |  |
@@ -44,6 +45,7 @@ This chart is used to set up the basic building blocks in [Validated Patterns](h
 | clusterGroup.argoCD.resourceHealthChecks[1].group | string | `"serving.kserve.io"` |  |
 | clusterGroup.argoCD.resourceHealthChecks[1].kind | string | `"InferenceService"` |  |
 | clusterGroup.argoCD.resourceTrackingMethod | string | `"label"` |  |
+| clusterGroup.argoCD.volumeMounts | list | `[]` |  |
 | clusterGroup.argoCD.volumes | list | `[]` |  |
 | clusterGroup.extraObjects | object | `{}` |  |
 | clusterGroup.imperative.activeDeadlineSeconds | int | `3600` |  |

templates/plumbing/argocd.yaml

@@ -55,6 +55,7 @@ spec:
       g, admin, role:admin
     scopes: '[groups, email]'
   repo:
+    env: {{ $.Values.clusterGroup.argoCD.env | toPrettyJson }}
     initContainers:
     - command:
       - bash
@@ -85,6 +86,9 @@ spec:
     volumeMounts:
     - mountPath: /etc/pki/tls/certs
       name: ca-bundles
+{{- if len $.Values.clusterGroup.argoCD.volumeMounts }}
+{{ toYaml $.Values.clusterGroup.argoCD.volumeMounts | indent 4 }}
+{{- end }}
     volumes:
     - configMap:
         name: kube-root-ca.crt
@@ -123,6 +127,9 @@ spec:
         imagePullPolicy: {{ coalesce $cmp.imagePullPolicy "Always" }}
         securityContext:
           runAsNonRoot: true
+{{- if $cmp.env }}
+        env: {{ $cmp.env | toPrettyJson }}
+{{- end }}
         volumeMounts:
           - mountPath: /var/run/argocd
             name: var-files

tests/argocd_cmp_test.yaml

@@ -13,6 +13,9 @@ tests:
               image: test-cmp-img
               pluginConfig: |
                 test-cmp-config
+              env:
+              - name: env-name
+                value: env-value
               volumeMounts:
                 - mountPath: /test
                   name: test-cmp-volumemount
@@ -38,6 +41,9 @@ tests:
             imagePullPolicy: Always
             securityContext:
               runAsNonRoot: true
+            env:
+            - name: env-name
+              value: env-value
             volumeMounts:
               - mountPath: /var/run/argocd
                 name: var-files

tests/argocd_env_test.yaml

@@ -0,0 +1,20 @@
+suite: Test argocd with env
+templates:
+  - templates/plumbing/argocd.yaml
+release:
+  name: release-test
+tests:
+  - it: should render the env correctly
+    set:
+      clusterGroup:
+        argoCD:
+          env:
+            - name: env-name
+              value: env-value
+    documentIndex: 0
+    asserts:
+      - contains:
+          path: spec.repo.env
+          content:
+            name: env-name
+            value: env-value

tests/argocd_volumesMounts_test.yaml

@@ -0,0 +1,20 @@
+suite: Test argocd with volumeMounts
+templates:
+  - templates/plumbing/argocd.yaml
+release:
+  name: release-test
+tests:
+  - it: should render the additional custom volumeMounts correctly
+    set:
+      clusterGroup:
+        argoCD:
+          volumeMounts:
+            - name: test-volume
+              mountPath: /test
+    documentIndex: 0
+    asserts:
+      - contains:
+          path: spec.repo.volumeMounts
+          content:
+            name: test-volume
+            mountPath: /test

values.schema.json

@@ -680,6 +680,14 @@
           "type": "array",
           "description": "A list of volumes to add to the repo-server if needed"
         },
+        "volumeMounts": {
+          "type": "array",
+          "description": "A list of volumeMounts to add to the repo-server if needed"
+        },
+        "env": {
+          "type": "array",
+          "description": "A list of environment variables to add to the repo-server if needed"
+        },
         "resourceTrackingMethod": {
           "type": "string",
           "description": "ResourceTrackingMethod defines how Argo CD should track resources that it manages",
@@ -718,6 +726,10 @@
           "type": "string",
           "description": "Image pull policy for the sidecar. Defaults to 'Always'"
         },
+        "env": {
+          "type": "array",
+          "description": "Environment variables for the sidecar"
+        },
         "volumeMounts": {
           "type": "array",
           "description": "Additional volumeMounts for the sidecar"

values.yaml

@@ -30,7 +30,9 @@ clusterGroup:
 
   argoCD:
     initContainers: []
+    env: []
     volumes: []
+    volumeMounts: []
     configManagementPlugins: []
     # resource tracking can be set to annotation, label, or annotation+label
     resourceTrackingMethod: label