Filecheck corrected, Test added and some polishing

Author: movray

applications/cluster-resources/ingress-nginx-helm-values.ftl.yaml

@@ -38,7 +38,7 @@ controller:
     # customize access log format to include requested hostname ($host)
     # https://github.com/kubernetes/ingress-nginx/blob/controller-v1.2.1/docs/user-guide/nginx-configuration/log-format.md
     log-format-upstream: '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" "$host" $request_length $request_time [$proxy_upstream_name] [$proxy_alternative_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status $req_id'
-<#if monitoringEnabled == true>
+<#if monitoring.active == true>
   metrics:
     enabled: true
     serviceMonitor:

src/main/groovy/com/cloudogu/gitops/features/IngressNginx.groovy

@@ -54,7 +54,9 @@ class IngressNginx extends Feature {
                 new TemplatingEngine().template(new File(HELM_VALUES_PATH),
                     [
                             podResources:      config.application['podResources'],
-                            monitoringEnabled: config.features['monitoring']['active'],
+                            monitoring : [
+                                    active :   config.features['monitoring']['active']
+                            ],
                             namePrefix:        config.application['namePrefix'] as String,
                     ])) as Map
 

src/main/groovy/com/cloudogu/gitops/features/PrometheusStack.groovy

@@ -20,7 +20,8 @@ import static com.cloudogu.gitops.features.deployment.DeploymentStrategy.RepoTyp
 class PrometheusStack extends Feature {
 
     static final String HELM_VALUES_PATH = "applications/cluster-resources/monitoring/prometheus-stack-helm-values.ftl.yaml"
-    
+    static final String MONITORING_RESOURCES_PATH = '/misc/monitoring/'
+
     private Map config
     private boolean remoteCluster
     private String username

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

@@ -2,6 +2,7 @@ package com.cloudogu.gitops.features.argocd
 
 import com.cloudogu.gitops.Feature
 import com.cloudogu.gitops.config.Configuration
+import com.cloudogu.gitops.features.PrometheusStack
 import com.cloudogu.gitops.scmm.ScmmRepo
 import com.cloudogu.gitops.scmm.ScmmRepoProvider
 import com.cloudogu.gitops.utils.*
@@ -21,6 +22,7 @@ class ArgoCD extends Feature {
     static final String HELM_VALUES_PATH = 'argocd/values.yaml'
     static final String CHART_YAML_PATH = 'argocd/Chart.yaml'
     static final String SCMM_URL_INTERNAL = "http://scmm-scm-manager.default.svc.cluster.local/scm"
+
     private Map config
     private List<RepoInitializationAction> gitRepos = []
 
@@ -144,7 +146,7 @@ class ArgoCD extends Feature {
 
         if (!config.features['monitoring']['active']) {
             log.debug("Deleting unnecessary monitoring folder from cluster resources: ${clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir()}")
-            deleteDir clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + '/misc/monitoring'
+            deleteDir clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH
         }
 
         if (!config.scmm["internal"]) {
@@ -154,6 +156,11 @@ class ArgoCD extends Feature {
             replaceFileContentInYamls(new File(exampleAppsInitializationAction.repo.getAbsoluteLocalRepoTmpDir()), SCMM_URL_INTERNAL, externalScmmUrl)
         }
 
+        if ((!config.features['ingressNginx']['active'])&&(config.features['monitoring']['active'])) {
+            deleteFile clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH + 'ingress-nginx-dashboard.yaml'
+            deleteFile clusterResourcesInitializationAction.repo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH + 'ingress-nginx-dashboard-requests-handling.yaml'
+        }
+
         fileSystemUtils.copyDirectory("${fileSystemUtils.rootDir}/applications/argocd/nginx/helm-umbrella",
                 Path.of(exampleAppsInitializationAction.repo.getAbsoluteLocalRepoTmpDir(), 'apps/nginx-helm-umbrella/').toString())
         exampleAppsInitializationAction.replaceTemplates()

src/test/groovy/com/cloudogu/gitops/features/IngressNginxTest.groovy

@@ -146,9 +146,9 @@ class IngressNginxTest {
 
         def actual = parseActualYaml()
 
-        assertThat(parseActualYaml()['controller']['metrics']['enabled']).isEqualTo(true)
-        assertThat(parseActualYaml()['controller']['metrics']['serviceMonitor']['enabled']).isEqualTo(true)
-        assertThat(parseActualYaml()['controller']['metrics']['serviceMonitor']['namespace']).isEqualTo("heliospheremonitoring")
+        assertThat(actual['controller']['metrics']['enabled']).isEqualTo(true)
+        assertThat(actual['controller']['metrics']['serviceMonitor']['enabled']).isEqualTo(true)
+        assertThat(actual['controller']['metrics']['serviceMonitor']['namespace']).isEqualTo("heliospheremonitoring")
     }
 
         private IngressNginx createIngressNginx() {

src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy

@@ -1,6 +1,7 @@
 package com.cloudogu.gitops.features.argocd
 
 import com.cloudogu.gitops.config.Configuration
+import com.cloudogu.gitops.features.PrometheusStack
 import com.cloudogu.gitops.scmm.ScmmRepo
 import com.cloudogu.gitops.utils.CommandExecutorForTest
 import com.cloudogu.gitops.utils.FileSystemUtils
@@ -99,6 +100,9 @@ class ArgoCDTest {
                                     version: '42.0.3'
                                     ]
                     ],
+                    ingressNginx : [
+                            active     : true
+                    ],
                     secrets    : [
                             active: true,
                             vault : [
@@ -230,14 +234,24 @@ class ArgoCDTest {
     void 'When monitoring disabled: Does not push path monitoring to cluster resources'() {
         config.features['monitoring']['active'] = false
         createArgoCD().install()
-        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + "/monitoring")).doesNotExist()
-    }
+        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH )).doesNotExist()
+     }
 
     @Test
     void 'When monitoring enabled: Does push path monitoring to cluster resources'() {
         config.features['monitoring']['active'] = true
         createArgoCD().install()
-        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + "/misc/monitoring")).exists()
+        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH )).exists()
+    }
+
+    @Test
+    void 'When ingressNginx disabled: Does not push monitoring dashboard resources'() {
+        config.features['monitoring']['active'] = true
+        config.features['ingressNginx']['active'] = false
+        createArgoCD().install()
+        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + PrometheusStack.MONITORING_RESOURCES_PATH )).exists()
+        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + "/misc/ingress-nginx-dashboard.yaml")).doesNotExist()
+        assertThat(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir() + "/misc/ingress-nginx-dashboard-requests-handling.yaml")).doesNotExist()
     }
 
     @Test
@@ -759,7 +773,7 @@ class ArgoCDTest {
             }
         }
 
-        assertAllYamlFiles(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir()), 'misc', 7) { Path it ->
+        assertAllYamlFiles(new File(clusterResourcesRepo.getAbsoluteLocalRepoTmpDir()), 'misc', 9) { Path it ->
             def yaml = parseActualYaml(it.toString())
             List yamlDocuments = yaml instanceof List ? yaml : [yaml]
             for (def document in yamlDocuments) {