Merge pull request #22 from projectsyn/fix/component-defaults

Fix components correctly rendered

Author: DebakelOrakel

class/defaults.yml

@@ -55,12 +55,12 @@ parameters:
       gateway:
         enabled: true
       # Optional
-      alertmanager:
-        enabled: true
       overridesExporter:
         enabled: true
+      patternIngester:
+        enabled: false
       ruler:
-        enabled: true
+        enabled: false
 
     caches:
       chunks:

component/helm_values.jsonnet

@@ -50,12 +50,12 @@ local components = com.makeMergeable({
     nodeSelector: std.get(params.components.gateway, 'nodeSelector', globalConfig.nodeSelector),
   } + com.makeMergeable(params.components.gateway),
   // "Optional" components
-  alertmanager: {
-    nodeSelector: std.get(params.components.alertmanager, 'nodeSelector', globalConfig.nodeSelector),
-  } + com.makeMergeable(params.components.alertmanager),
   overridesExporter: {
     nodeSelector: std.get(params.components.overridesExporter, 'nodeSelector', globalConfig.nodeSelector),
   } + com.makeMergeable(params.components.overridesExporter),
+  patternIngester: {
+    nodeSelector: std.get(params.components.patternIngester, 'nodeSelector', globalConfig.nodeSelector),
+  } + com.makeMergeable(params.components.patternIngester),
   ruler: {
     nodeSelector: std.get(params.components.ruler, 'nodeSelector', globalConfig.nodeSelector),
   } + com.makeMergeable(params.components.ruler),

docs/modules/ROOT/pages/references/parameters.adoc

@@ -249,21 +249,6 @@ components:
 The Loki gateway is a critical component for query, write, and alert paths.
 It improves performance and simplifies deployments by acting as a single entry point for all Loki requests.
 
-=== `components.alertmanager`
-
-[horizontal]
-type:: dict
-default::
-+
-[source,yaml]
-----
-components:
-  alertmanager:
-    enabled: true
-----
-
-The Loki Alertmanager is an optional component that accepts alert notifications from the Loki ruler.
-
 === `components.overridesExporter`
 
 [horizontal]

tests/extra-config.yml

@@ -30,6 +30,8 @@ parameters:
         tag: latest
 
     components:
+      patternIngester:
+        enabled: true
       ruler:
         enabled: true
 

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/compactor/workload.yaml

@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
+        checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
         kubectl.kubernetes.io/default-container: compactor
       labels:
         app.kubernetes.io/component: compactor

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/config.yaml

@@ -85,17 +85,6 @@ data:
             consistent_hash: true
             timeout: 500ms
             update_interval: 1m
-    ruler:
-      storage:
-        s3:
-          access_key_id: ${S3_ACCESS_KEY_ID}
-          bucketnames: defaults-ruler
-          insecure: false
-          s3forcepathstyle: true
-          secret_access_key: ${S3_SECRET_ACCESS_KEY}
-        type: s3
-      wal:
-        dir: /var/loki/ruler-wal
     runtime_config:
       file: /etc/loki/runtime-config/runtime-config.yaml
     schema_config:

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/distributor/workload.yaml

@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
+        checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
         kubectl.kubernetes.io/default-container: distributor
       labels:
         app.kubernetes.io/component: distributor

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/index-gateway/workload.yaml

@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
+        checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
         kubectl.kubernetes.io/default-container: index-gateway
       labels:
         app.kubernetes.io/component: index-gateway

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/ingester/workload.yaml

@@ -22,7 +22,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
+        checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
         kubectl.kubernetes.io/default-container: ingester
       labels:
         app.kubernetes.io/component: ingester

tests/golden/defaults/defaults/defaults/10_helm_loki/loki/templates/overrides-exporter/workload.yaml

@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
+        checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
         kubectl.kubernetes.io/default-container: overrides-exporter
       labels:
         app.kubernetes.io/component: overrides-exporter