OZG-2615 remove scrapeMetricsDisabled as metrics should be default enabled

questions.yml

@@ -23,12 +23,6 @@ questions:
     group: "Container"
     type: string
     label: "Override Spring boot profile"
-  - variable: scrapeMetricsDisabled
-    group: "Other"
-    type: boolean
-    default: false
-    label: "Disable Scrape Metrics"
-
   - variable: kop.bezeichner
     group: "KOP"
     label: "Bezeichner"

templates/deployment.yaml

@@ -64,11 +64,9 @@ spec:
         - containerPort: 8080
           name: 8080tcp1
           protocol: TCP
-        {{- if not .Values.scrapeMetricsDisabled }}
         - containerPort: 8081
           name: metrics
           protocol: TCP
-        {{- end }}
         readinessProbe:
           failureThreshold: 3
           httpGet:

templates/service.yaml

@@ -12,11 +12,9 @@ spec:
       port: 8080
       protocol: TCP
       targetPort: 8080
-    {{- if not .Values.scrapeMetricsDisabled }}
     - name: metrics
       port: 8081
       protocol: TCP
-    {{- end }}
   type: ClusterIP
   selector:
     {{- include "app.matchLabels" . | indent 4 }}

templates/service_monitor.yaml

-{{- if not .Values.scrapeMetricsDisabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -18,4 +17,3 @@ spec:
     matchLabels:
       {{- include "app.matchLabels" . | indent 6 }}
       component: afm-adapter-service
\ No newline at end of file
-{{- end }}
\ No newline at end of file

unit-tests/deployment_defaults_annotaion_test.yaml

@@ -9,7 +9,6 @@ tests:
     set:
       kop.environment: dev
       kop.bezeichner: helm
-      scrapeMetricsDisabled: false
     asserts:
       - isKind:
           of: Ingress

unit-tests/deployment_defaults_labels_test.yaml

@@ -10,7 +10,6 @@ tests:
   - it: check default labels
     set:
       kop.environment: dev
-      scrapeMetricsDisabled: false
     asserts:
       - equal:
           path: metadata.labels.[app.kubernetes.io/instance]

unit-tests/deployment_scrapeMetrics_test.yaml

-suite: test deployment
-release:
-  name: afm-adapter
-  namespace: sh-helm-test
-templates:
-  - templates/deployment.yaml
-tests:
-  - it: should set the metrics port by default
-    set:
-      kop.environment: test
-      scrapeMetricsDisabled: false
-    asserts:
-      - isKind:
-          of: Deployment
-      - contains:
-          path: spec.template.spec.containers[0].ports
-          content:
-            name: metrics
-            containerPort: 8081
-            protocol: TCP
-  - it: should deactivate the metrics port at will
-    set:
-      kop.environment: test
-      scrapeMetricsDisabled: true
-    asserts:
-      - isKind:
-          of: Deployment
-      - notContains:
-          path: spec.template.spec.containers[0].ports
-          content:
-            name: metrics
-            containerPort: 8081
-            protocol: TCP
\ No newline at end of file

unit-tests/service_monitor_test.yaml

@@ -6,8 +6,6 @@ templates:
   - templates/service_monitor.yaml
 tests:
   - it: should have the label component with value afm-adapter-service-monitor attached
-    set:
-      scrapeMetricsDisabled: false
     asserts:
       - isKind:
           of: ServiceMonitor
@@ -16,7 +14,6 @@ tests:
           value: afm-adapter-service-monitor
   - it: should have the metrics endpoint configured by default
     set:
-      scrapeMetricsDisabled: false
       env.springProfiles: oc,stage
     asserts:
       - isKind:
@@ -27,8 +24,6 @@ tests:
             port: metrics
             path: /actuator/prometheus
   - it: should be able to enable the endpoint
-    set:
-      scrapeMetricsDisabled: false
     asserts:
       - isKind:
           of: ServiceMonitor
@@ -38,22 +33,16 @@ tests:
             port: metrics
             path: /actuator/prometheus
   - it: namespace selector should contain the namespace
-    set:  
-      scrapeMetricsDisabled: false
     asserts:
       - contains:
           path: spec.namespaceSelector.matchNames
           content: sh-helm-test
   - it: selector should contain the component label with the value afm-adapter-service
-    set:
-      scrapeMetricsDisabled: false
     asserts:
       - equal:
           path: spec.selector.matchLabels.[component]
           value: afm-adapter-service
   - it: selector should contain helm recommended labels name and namespace
-    set:
-      scrapeMetricsDisabled: false
     asserts:
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/name]

unit-tests/service_test.yaml

@@ -29,8 +29,6 @@ tests:
         count: 1
         any: true
   - it: ports should contain the metrics port
-    set:
-      scrapeMetricsDisabled: false
     asserts:
       - contains:
           path: spec.ports
@@ -40,18 +38,6 @@ tests:
             protocol: TCP
         count: 1
         any: true
-  - it: ports should not contain the metrics port when deactivated
-    set:
-      scrapeMetricsDisabled: true
-    asserts:
-      - notContains:
-          path: spec.ports
-          content:
-            name: metrics
-            port: 8081
-            protocol: TCP
-        count: 1
-        any: true
   - it: selector should contain the component label with the value afm-adapter
     asserts:
       - equal:

values.yaml

-scrapeMetricsDisabled: true # [default: false]. Flag to disable actuator prometheus route scraping.
-
 image:
   name: intelliform-adapter # [default: intelliform-adapter]
 #  tag: latest # [default: latest]