allow own values for ArgoCD Operator (#334)

Co-authored-by: Thomas Michael <[email protected]>

Author: ThomasMichael1811

README.md

@@ -410,17 +410,18 @@ That is, if you pass a param via CLI, for example, it will overwrite the corresp
 
 ###### ArgoCD
 
-| CLI | Config | Default | Type | Description |
-|-----|--------|---------|------|-------------|
-| `--argocd` | `features.argocd.active` | `false` | Boolean | Installs ArgoCD as GitOps CD tool |
-| `--argocd-operator` | `features.argocd.operator` | `false` | Boolean | Install ArgoCD operator |
-| `--argocd-url` | `features.argocd.url` | `''` | String | The url of your external argocd |
-| `--argocd-email-from` | `features.argocd.emailFrom` | `'[email protected]'` | String | Email from address for ArgoCD notifications |
-| `--argocd-email-to-user` | `features.argocd.emailToUser` | `'[email protected]'` | String | Email to address for user notifications |
-| `--argocd-email-to-admin` | `features.argocd.emailToAdmin` | `'[email protected]'` | String | Email to address for admin notifications |
-| `--argocd-resource-inclusions-cluster` | `features.argocd.resourceInclusionsCluster` | `''` | String | ArgoCD resource inclusions for cluster |
-| `--argocd-namespace` | `features.argocd.namespace` | `'argocd'` | String | ArgoCD namespace |
-| - | `features.argocd.env` | - | List | Environment variables for ArgoCD |
+| CLI | Config                                      | Default | Type    | Description                                 |
+|-----|---------------------------------------------|---------|---------|---------------------------------------------|
+| `--argocd` | `features.argocd.active`                    | `false` | Boolean | Installs ArgoCD as GitOps CD tool           |
+| `--argocd-operator` | `features.argocd.operator`                  | `false` | Boolean | Install ArgoCD operator                     |
+| `--argocd-url` | `features.argocd.url`                       | `''` | String  | The url of your external argocd             |
+| `--argocd-email-from` | `features.argocd.emailFrom`                 | `'[email protected]'` | String  | Email from address for ArgoCD notifications |
+| `--argocd-email-to-user` | `features.argocd.emailToUser`               | `'[email protected]'` | String  | Email to address for user notifications     |
+| `--argocd-email-to-admin` | `features.argocd.emailToAdmin`              | `'[email protected]'` | String  | Email to address for admin notifications    |
+| `--argocd-resource-inclusions-cluster` | `features.argocd.resourceInclusionsCluster` | `''` | String  | ArgoCD resource inclusions for cluster      |
+| `--argocd-namespace` | `features.argocd.namespace`                 | `'argocd'` | String  | ArgoCD namespace                            |
+| - | `features.argocd.env`                       | - | List    | Environment variables for ArgoCD            |
+| - | `features.argocd.values`                    | - | Map     | To override ArgoCD Operator file            |
 
 ###### Mail
 

docs/configuration.schema.json

@@ -270,6 +270,10 @@
             "url" : {
               "type" : [ "string", "null" ],
               "description" : "The URL where argocd is accessible. It has to be the full URL with http:// or https://"
+            },
+            "values" : {
+              "$ref" : "#/$defs/Map(String,Object)-nullable",
+              "description" : "Helm values of the chart, allows overriding defaults and setting values that are not exposed as explicit configuration"
             }
           },
           "additionalProperties" : false,

src/main/groovy/com/cloudogu/gitops/config/Config.groovy

@@ -489,6 +489,9 @@ class Config {
         @Option(names = ['--argocd-namespace'], description = ARGOCD_CUSTOM_NAMESPACE_DESCRIPTION)
         @JsonPropertyDescription(ARGOCD_CUSTOM_NAMESPACE_DESCRIPTION)
         String namespace = 'argocd'
+
+        @JsonPropertyDescription(HELM_CONFIG_VALUES_DESCRIPTION)
+        Map<String, Object> values = [:]
     }
 
     static class MailSchema {

src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy

@@ -10,9 +10,11 @@ import com.cloudogu.gitops.kubernetes.rbac.Role
 import com.cloudogu.gitops.utils.FileSystemUtils
 import com.cloudogu.gitops.utils.HelmClient
 import com.cloudogu.gitops.utils.K8sClient
+import com.cloudogu.gitops.utils.MapUtils
 import groovy.util.logging.Slf4j
 import io.micronaut.core.annotation.Order
 import jakarta.inject.Singleton
+
 import org.springframework.security.crypto.bcrypt.BCrypt
 
 import java.nio.file.Path
@@ -226,6 +228,19 @@ class ArgoCD extends Feature {
     private void deployWithOperator() {
         // Apply argocd yaml from operator folder
         String argocdConfigPath = Path.of(argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), OPERATOR_CONFIG_PATH)
+        if (this.config.features.argocd?.values) {
+            log.debug("extend Argocd.yaml with ${this.config.features.argocd.values}")
+            def argocdYaml = fileSystemUtils.readYaml(
+                    Path.of(argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), OPERATOR_CONFIG_PATH))
+
+            def result = MapUtils.deepMerge(this.config.features.argocd.values, argocdYaml)
+            fileSystemUtils.writeYaml(result, new File (argocdConfigPath))
+            log.debug("Argocd.yaml for operator contains ${result}")
+            // reload file
+            argocdConfigPath = Path.of(argocdRepoInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), OPERATOR_CONFIG_PATH)
+
+        }
+
         k8sClient.applyYaml(argocdConfigPath)
 
         // ArgoCD is not installed until the ArgoCD-Operator did his job.