changed to Typed Config, renamed Schema to Config, removed Config Provider

Author: nihussmann

Dockerfile

@@ -98,9 +98,9 @@ RUN cp /tmp/.gitconfig /dist/home/.gitconfig
 COPY scripts/jenkins/plugins /jenkins
 RUN /jenkins/download-plugins.sh /dist/gitops/jenkins-plugins
 
-COPY src/main/groovy/com/cloudogu/gitops/config/schema/Schema.groovy /tmp/
+COPY src/main/groovy/com/cloudogu/gitops/config/Config.groovy /tmp/
 COPY scripts/downloadHelmCharts.sh /tmp/
-RUN cd /dist/gitops && /tmp/downloadHelmCharts.sh /tmp/Schema.groovy
+RUN cd /dist/gitops && /tmp/downloadHelmCharts.sh /tmp/Config.groovy
 
 WORKDIR /tmp
 # Prepare local files for later stages
@@ -178,9 +178,9 @@ COPY --from=maven-build /app/gitops-playground.jar /app/
 # Create Graal native image config
 RUN java -agentlib:native-image-agent=config-output-dir=conf/ -jar gitops-playground.jar || true
 # Run again with different params in order to avoid NoSuchMethodException with config file
-RUN printf 'features:\n  exampleApps:\n    petclinic:\n      baseDomain: "base"' > config.yaml  && \
+RUN printf 'application:\n  \"yes\": true\nfeatures:\n  secrets:\n    vault:\n      mode: "dev"\n  exampleApps:\n    petclinic:\n      baseDomain: ""' > config.yaml  && \
     java -agentlib:native-image-agent=config-merge-dir=conf/ -jar gitops-playground.jar \
-      --yes --config-file=config.yaml || true
+      --trace --config-file=config.yaml || true
 # Run again with different params in order to avoid NoSuchMethodException with output-config file
 RUN java -agentlib:native-image-agent=config-merge-dir=conf/ -jar gitops-playground.jar \
       --yes  --output-config-file || true

applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml

@@ -201,7 +201,7 @@ grafana:
       repository: ${sidecarImageObject.repository}
       tag: ${sidecarImageObject.tag}
 </#if>
-<#if mail.active??>
+<#if mail.active?? && mail.active>
   notifiers:
     notifiers.yaml:
       notifiers:
@@ -244,7 +244,7 @@ grafana:
   env:
     GF_SMTP_ENABLED: true
     GF_SMTP_FROM_ADDRESS: ${monitoring.grafanaEmailFrom}
-    GF_SMTP_HOST: ${mail.smtpAddress}<#if mail.smtpPort?has_content>:${mail.smtpPort}</#if>
+    GF_SMTP_HOST: ${mail.smtpAddress}<#if mail.smtpPort?has_content>:${mail.smtpPort?c}</#if>
  <#else>
   env:
     GF_SMTP_ENABLED: true

argocd/argocd/applications/argocd.ftl.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     # Only app with the sync-status-unknown alert, so that we only get one alert when SCM is not reachable.
     # Otherwise, there would be a spam wave by every application everytime the SCM is not reachable.
-<#if mail.active??>
+<#if mail.active?? && mail.active>
     notifications.argoproj.io/subscribe.on-sync-status-unknown.email: ${argocd.emailToAdmin}
 </#if>
 # finalizer disabled, because otherwise everything under this Application would be deleted as well, if this Application is deleted by accident

argocd/argocd/argocd/values.ftl.yaml

@@ -125,14 +125,14 @@ argo-cd:
     # secrets are created dynamically in groovy, so they are not stored in git
     secret:
       create: false
-    enabled: <#if mail.active??>true<#else>false</#if>
+    enabled: <#if mail.active == true>true<#else>false</#if>
     argocdUrl: https://localhost:9092
-<#if mail.active??>
+<#if mail.active?? && mail.active>
     notifiers:
       service.email: |
       <#if mail.smtpAddress?has_content>
         host: ${mail.smtpAddress}
-        <#if mail.smtpPort?has_content>port: ${mail.smtpPort}</#if>
+        <#if mail.smtpPort??>port: ${mail.smtpPort?c}</#if>
         <#if mail.smtpUser?has_content>username: $email-username</#if>
         <#if mail.smtpPassword?has_content>password: $email-password</#if>
       <#else>

argocd/argocd/projects/argocd.ftl.yaml

@@ -4,7 +4,7 @@ metadata:
   name: argocd
   namespace: ${namePrefix}argocd
   annotations:
-<#if mail.active??>
+<#if mail.active?? && mail.active>
     notifications.argoproj.io/subscribe.email: ${argocd.emailToAdmin}
 </#if>
 spec:

argocd/argocd/projects/cluster-resources.ftl.yaml

@@ -5,7 +5,7 @@ metadata:
   # In a real-world scenario these might to into a separate namespace
   namespace: ${namePrefix}argocd
   annotations:
-<#if mail.active??>
+<#if mail.active?? && mail.active>
     notifications.argoproj.io/subscribe.email: ${argocd.emailToAdmin}
 </#if>
 spec:

argocd/argocd/projects/default.ftl.yaml

@@ -4,7 +4,7 @@ metadata:
   name: default
   namespace: ${namePrefix}argocd
   annotations:
-<#if mail.active??>
+<#if mail.active?? && mail.active>
     notifications.argoproj.io/subscribe.email: ${argocd.emailToAdmin}
 </#if>
 spec:

argocd/argocd/projects/example-apps.ftl.yaml

@@ -4,7 +4,7 @@ metadata:
   name: example-apps
   namespace: ${namePrefix}argocd
   annotations:
-<#if mail.active??>
+<#if mail.active?? && mail.active>
      notifications.argoproj.io/subscribe.email: ${argocd.emailToUser}
 </#if>
 spec:

docs/configuration.schema.json

@@ -166,52 +166,52 @@
             }
           },
           "additionalProperties" : false,
-          "description" : "Configuration Parameter for the ArgoCD Operator"
+          "description" : "Config Parameter for the ArgoCD Operator"
         },
         "certManager" : {
-          "type" : "object",
+          "type" : [ "object", "null" ],
           "properties" : {
             "active" : {
-              "type" : "boolean",
+              "type" : [ "boolean", "null" ],
               "description" : "Sets and enables Cert Manager"
             },
             "helm" : {
-              "type" : "object",
+              "type" : [ "object", "null" ],
               "properties" : {
                 "acmeSolverImage" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Sets acmeSolver Image for Cert Manager"
                 },
                 "cainjectorImage" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Sets cainjector Image for Cert Manager"
                 },
                 "chart" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Name of the Helm chart"
                 },
                 "image" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Sets image for Cert Manager"
                 },
                 "repoURL" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Repository url from which the Helm chart should be obtained"
                 },
                 "startupAPICheckImage" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Sets startupAPICheck Image for Cert Manager"
                 },
                 "values" : {
-                  "$ref" : "#/$defs/Map(String,Object)",
+                  "$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"
                 },
                 "version" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "The version of the Helm chart to be installed"
                 },
                 "webhookImage" : {
-                  "type" : "string",
+                  "type" : [ "string", "null" ],
                   "description" : "Sets webhook Image for Cert Manager"
                 }
               },

scm-manager/values.ftl.yaml

@@ -7,7 +7,7 @@ extraEnv: |
     - name: SCM_WEBAPP_INITIALPASSWORD
       value: "${password}"
 
-<#if !remote>
+<#if remote?? && !remote>
 service:
   nodePort: 9091
   type: NodePort