fix values

SCT-Engineering · Apr 1, 2025 · 20f12ef · 20f12ef
1 parent 2308742
commit 20f12ef
Showing 1 changed file with 16 additions and 217 deletions.
diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
@@ -8,8 +8,6 @@ global:
 
 # Main Loki configuration
 loki:
-<<<<<<< HEAD
-<<<<<<< HEAD
   auth_enabled: false
   image:
     repository: ${loki_image_repository}
@@ -24,63 +22,8 @@ loki:
     max_streams_per_user: 1000
     query_timeout: 300s
     retention_period: 2160h
-=======
-=======
   analytics:
     reporting_enabled: true
-  auth_enabled: false
->>>>>>> 54f31cf (unified config)
-  image:
-    repository: ${loki_image_repository}
-    tag: ${loki_image_tag}
-  ingester:
-    chunk_encoding: snappy
-  limits_config:
-    allow_structured_metadata: true
-    query_timeout: 30s
-    max_streams_per_user: 1000
-    max_query_parallelism: 32
-    max_query_length: 2160h
-    ingestion_rate_strategy: local
-    split_queries_by_interval: 15m
-    max_cache_freshness_per_query: 10m
-    reject_old_samples_max_age: 168h
-    reject_old_samples: true
-    retention_period: 2160h
-  # Storage configuration
-  use_thanos_objstore: true
-  object_store:
-    s3:
-      bucketName: ${s3_bucket_name}
-      endpoint: s3.${region}.amazonaws.com
-      region: ${region}
-<<<<<<< HEAD
-  storage_config:
-    aws:
-      s3: s3://${region}/${s3_bucket_name}
-
->>>>>>> 98921ea (refactor chart values)
-=======
->>>>>>> 54f31cf (unified config)
-  # Provisioner settings
-  provisioner:
-    image:
-      repository: ${provisioner_image_repository}
-      tag: ${provisioner_image_tag}
-<<<<<<< HEAD
-<<<<<<< HEAD
-  querier:
-    max_concurrent: 4
-  replication_factor: 1
-  schemaConfig:
-    configs:
-      - from: "2024-04-01"
-        store: tsdb
-        object_store: s3
-        schema: v13
-        index:
-          prefix: index_
-          period: 24h
   # Storage configuration
   storage:
     type: s3
@@ -96,50 +39,32 @@ loki:
   tracing:
     enabled: true
 
-
-backend:
-=======
-
-=======
-  replication_factor: 1
->>>>>>> 54f31cf (unified config)
-  schemaConfig:
-    configs:
-      - from: 2024-04-01
-        index:
-          period: 24h
-          prefix: index_
-        object_store: s3
-        schema: v13
-        store: tsdb
-  tracing:
-    enabled: true
-
 backend:
-<<<<<<< HEAD
-  persistence:
-    enabled: true
-    storageClass: ${rwo_storage_class}
-  replicas: 1
->>>>>>> 98921ea (refactor chart values)
-=======
->>>>>>> 54f31cf (unified config)
   autoscaling:
     enabled: true
     minReplicas: 1
     targetCPUUtilizationPercentage: 80
-<<<<<<< HEAD
-<<<<<<< HEAD
   persistence:
+    enabled: true
     storageClass: ${rwo_storage_class}
-  replicas: 3
+  replicas: 1
+  replication_factor: 1
   resources:
     requests:
       cpu: 10m
       memory: 128Mi
     limits:
       cpu: 1000m
       memory: 512Mi
+  schemaConfig:
+    configs:
+      - from: 2024-04-01
+        index:
+          period: 24h
+          prefix: index_
+        object_store: s3
+        schema: v13
+        store: tsdb
 bloomCompactor:
   replicas: 0
 bloomGateway:
@@ -150,56 +75,13 @@ compactor:
   replicas: 0
 distributer:
   replicas: 0
-=======
-=======
-  persistence:
-    enabled: true
-    storageClass: ${rwo_storage_class}
-  replicas: 1
->>>>>>> 54f31cf (unified config)
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-bloomCompactor:
-  replicas: 0
-bloomGateway:
-  replicas: 0
-chunksCache:
-  enabled: false
-compactor:
-  replicas: 0
-  working_directory: /loki/compactor
-  shared_store: s3
-  compaction_interval: 10m
-  retention_enabled: true
-  retention_delete_delay: 2h
-  retention_delete_worker_count: 150
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-<<<<<<< HEAD
-
->>>>>>> 98921ea (refactor chart values)
-=======
-distributer:
-  replicas: 0
->>>>>>> 54f31cf (unified config)
 gateway:
   image:
     repository: ${gateway_image_repository}
     tag: ${gateway_image_tag}
   autoscaling:
     enabled: true
     targetCPUUtilizationPercentage: 80
-<<<<<<< HEAD
   replicas: 1
   resources:
     requests:
@@ -229,105 +111,45 @@ queryFrontend:
 queryScheduler:
   replicas: 0
 read:
-=======
+  replicas: 1
   resources:
     requests:
-      cpu: 1m
-      memory: 1Mi
+      cpu: 10m
+      memory: 128Mi
     limits:
       cpu: 100m
       memory: 128Mi
-indexGateway:
-  replicas: 0
-ingester:
-  replicas: 0
-lokiCanary:
-  enabled: false
-memcached:
-  enabled: false
-  chunk_cache:
-    enabled: false
-  results_cache:
-    enabled: false
-memcachedExporter:
-  enabled: false
-querier:
-  replicas: 0
-  max_concurrent: 4
-queryFrontend:
-  replicas: 0
-queryScheduler:
-  replicas: 0
-read:
-<<<<<<< HEAD
   persistence:
     enabled: true
     storageClass: ${rwo_storage_class}
-  replicas: 1
->>>>>>> 98921ea (refactor chart values)
-=======
->>>>>>> 54f31cf (unified config)
   autoscaling:
     enabled: true
     minReplicas: 1
     targetCPUUtilizationPercentage: 80
-<<<<<<< HEAD
-<<<<<<< HEAD
-  replicas: 3
-  resources:
-    requests:
-      cpu: 10m
-      memory: 128Mi
-    limits:
-      cpu: 500m
-      memory: 512Mi
 resultsCache:
   enabled: false
 ruler:
   enabled: false
 serviceAccount:
   annotations:
     eks.amazonaws.com/role-arn: ${iam_role_arn}
-=======
-=======
   persistence:
     enabled: true
     storageClass: ${rwo_storage_class}
   replicas: 1
->>>>>>> 54f31cf (unified config)
   resources:
     requests:
       cpu: 1m
       memory: 1Mi
     limits:
       cpu: 200m
       memory: 256Mi
-resultsCache:
-  enabled: false
-ruler:
-<<<<<<< HEAD
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-
->>>>>>> 98921ea (refactor chart values)
-=======
-  enabled: false
-serviceAccount:
-  annotations:
-    eks.amazonaws.com/role-arn: ${iam_role_arn}
->>>>>>> 54f31cf (unified config)
 sidecar:
   image:
     repository: ${sidecar_image_repository}
     tag: ${sidecar_image_tag}
   resources:
     requests:
-<<<<<<< HEAD
       cpu: 10m
       memory: 128Mi
     limits:
@@ -337,41 +159,19 @@ singleBinary:
   replicas: 0
 test:
   enabled: false
-write:
-  persistence:
-    storageClass: ${rwo_storage_class}
-  replicas: 3
-=======
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-singleBinary:
-  replicas: 0
-test:
-  enabled: false
 write:
   persistence:
     enabled: true
     storageClass: ${rwo_storage_class}
   replicas: 1
->>>>>>> 98921ea (refactor chart values)
   autoscaling:
     enabled: true
     minReplicas: 1
   targetCPUUtilizationPercentage: 80
   resources:
     requests:
-<<<<<<< HEAD
-      cpu: 10m
+      cpu: 100m
       memory: 128Mi
-    limits:
-      cpu: 1000m
-      memory: 512Mi
-=======
-      cpu: 1m
-      memory: 1Mi
     limits:
       cpu: 200m
       memory: 256Mi
@@ -380,4 +180,3 @@ write:
       mountPath: /loki
   extraVolumes:
     - name: loki
->>>>>>> 98921ea (refactor chart values)