Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert "feat(helm)!: Update loki ( 5.47.2 → 6.0.0 )"" #7339

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Revert "Revert "feat(helm)!: Update loki ( 5.47.2 → 6.0.0 )"" #7339

merged 2 commits into from
Apr 8, 2024

Conversation

onedr0p
Copy link
Owner

@onedr0p onedr0p commented Apr 8, 2024

Reverts #7336

@bot-ross bot-ross bot added area/kubernetes Changes made in the kubernetes directory cluster/main labels Apr 8, 2024
@bot-ross
Copy link
Contributor

bot-ross bot commented Apr 8, 2024 

--- kubernetes/main/apps/observability/loki/app Kustomization: flux-system/loki HelmRelease: observability/loki

+++ kubernetes/main/apps/observability/loki/app Kustomization: flux-system/loki HelmRelease: observability/loki

@@ -13,13 +13,13 @@

     spec:
       chart: loki
       sourceRef:
         kind: HelmRepository
         name: grafana
         namespace: flux-system
-      version: 5.47.2
+      version: 6.0.0
   dependsOn:
   - name: openebs
     namespace: openebs-system
   - name: rook-ceph-cluster
     namespace: rook-ceph
   - name: vector-agent
@@ -82,16 +82,16 @@

             s3:
               insecure: true
               s3: null
               s3forcepathstyle: true
         compactor:
           compaction_interval: 10m
+          delete_request_store: s3
           retention_delete_delay: 2h
           retention_delete_worker_count: 150
           retention_enabled: true
-          shared_store: s3
           working_directory: /var/loki/boltdb-shipper-compactor
         distributor:
           ring:
             kvstore:
               store: memberlist
         frontend:
@@ -143,26 +143,14 @@

             schema: v12
             store: boltdb-shipper
         server:
           grpc_listen_port: 9095
           http_listen_port: 3100
           log_level: info
-    monitoring:
-      dashboards:
-        annotations:
-          grafana_folder: Loki
-      lokiCanary:
-        enabled: false
-      selfMonitoring:
-        enabled: false
-        grafanaAgent:
-          installOperator: false
-      serviceMonitor:
-        enabled: false
-        metricsInstance:
-          enabled: false
+    lokiCanary:
+      enabled: false
     read:
       extraVolumeMounts:
       - mountPath: /rules
         name: rules
       extraVolumes:
       - emptyDir: {}

@bot-ross
Copy link
Contributor

bot-ross bot commented Apr 8, 2024 

--- HelmRelease: observability/loki ConfigMap: observability/loki

+++ HelmRelease: observability/loki ConfigMap: observability/loki

@@ -11,12 +11,27 @@

 data:
   config.yaml: |2
 
     analytics:
       reporting_enabled: false
     auth_enabled: false
+    chunk_store_config:
+      chunk_cache_config:
+        background:
+          writeback_buffer: 500000
+          writeback_goroutines: 1
+          writeback_size_limit: 500MB
+        default_validity: 0s
+        memcached:
+          batch_size: 4
+          parallelism: 5
+        memcached_client:
+          addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.observability.svc
+          consistent_hash: true
+          max_idle_conns: 72
+          timeout: 2000ms
     common:
       compactor_address: 'http://loki-backend:3100'
       path_prefix: /var/loki
       replication_factor: 2
       ring:
         kvstore:
@@ -29,28 +44,29 @@

           insecure: true
           s3: null
           s3forcepathstyle: true
           secret_access_key: '**PLACEHOLDER**'
     compactor:
       compaction_interval: 10m
+      delete_request_store: s3
       retention_delete_delay: 2h
       retention_delete_worker_count: 150
       retention_enabled: true
-      shared_store: s3
       working_directory: /var/loki/boltdb-shipper-compactor
     distributor:
       ring:
         kvstore:
           store: memberlist
     frontend:
       max_outstanding_per_tenant: 4096
-      scheduler_address: query-scheduler-discovery.observability.svc.cluster.local.:9095
+      scheduler_address: ""
+      tail_proxy_url: http://loki-querier.observability.svc.cluster.local:3100
     frontend_worker:
-      scheduler_address: query-scheduler-discovery.observability.svc.cluster.local.:9095
+      scheduler_address: ""
     index_gateway:
-      mode: ring
+      mode: simple
     ingester:
       lifecycler:
         ring:
           kvstore:
             store: memberlist
       max_chunk_age: 1h
@@ -59,23 +75,37 @@

       ingestion_burst_size_mb: 1000
       ingestion_rate_mb: 50
       max_cache_freshness_per_query: 10m
       max_query_parallelism: 100
       per_stream_rate_limit: 5MB
       per_stream_rate_limit_burst: 20MB
+      query_timeout: 300s
       reject_old_samples: true
       reject_old_samples_max_age: 168h
       retention_period: 14d
       shard_streams:
         enabled: true
       split_queries_by_interval: 1h
     memberlist:
       join_members:
       - loki-memberlist
     query_range:
       align_queries_with_step: true
+      cache_results: true
+      results_cache:
+        cache:
+          background:
+            writeback_buffer: 500000
+            writeback_goroutines: 1
+            writeback_size_limit: 500MB
+          default_validity: 12h
+          memcached_client:
+            addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.observability.svc
+            consistent_hash: true
+            timeout: 500ms
+            update_interval: 1m
     query_scheduler:
       max_outstanding_requests_per_tenant: 4096
     ruler:
       alertmanager_url: http://alertmanager-operated.observability.svc.cluster.local:9093
       enable_alertmanager_v2: true
       enable_api: true
@@ -102,15 +132,23 @@

         object_store: s3
         schema: v12
         store: boltdb-shipper
     server:
       grpc_listen_port: 9095
       http_listen_port: 3100
+      http_server_read_timeout: 600s
+      http_server_write_timeout: 600s
       log_level: info
     storage_config:
+      boltdb_shipper:
+        index_gateway_client:
+          server_address: dns+loki-backend-headless.observability.svc.cluster.local:9095
       hedging:
         at: 250ms
         max_per_second: 20
         up_to: 3
+      tsdb_shipper:
+        index_gateway_client:
+          server_address: dns+loki-backend-headless.observability.svc.cluster.local:9095
     tracing:
       enabled: false
 
--- HelmRelease: observability/loki ConfigMap: observability/loki-gateway

+++ HelmRelease: observability/loki ConfigMap: observability/loki-gateway

@@ -20,23 +20,24 @@

     \    1.1;\n\n  default_type application/octet-stream;\n  log_format   main '$remote_addr\
     \ - $remote_user [$time_local]  $status '\n        '\"$request\" $body_bytes_sent\
     \ \"$http_referer\" '\n        '\"$http_user_agent\" \"$http_x_forwarded_for\"\
     ';\n  access_log   /dev/stderr  main;\n\n  sendfile     on;\n  tcp_nopush   on;\n\
     \  resolver kube-dns.kube-system.svc.cluster.local.;\n  \n\n  server {\n    listen\
     \             8080;\n    listen             [::]:8080;\n\n    location = / {\n\
-    \      return 200 'OK';\n      auth_basic off;\n    }\n\n\n    # Distributor\n\
-    \    location = /api/prom/push {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
+    \      return 200 'OK';\n      auth_basic off;\n    }\n\n    ########################################################\n\
+    \    # Configure backend targets# Distributor\n    location = /api/prom/push {\n\
+    \      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/push {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /distributor/ring {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # Ingester\n    location = /flush {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /ingester/ {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /ingester {\n      internal;        # to suppress 301\n\
     \    }\n\n    # Ring\n    location = /ring {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # MemberListKV\n    location = /memberlist {\n      proxy_pass \
     \      http://loki-write.observability.svc.cluster.local:3100$request_uri;\n \
-    \   }\n\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
+    \   }\n\n    # Ruler\n    location = /ruler/ring {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /api/prom/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /api/prom/rules/ {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location ^~ /loki/api/v1/rules/ {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/alerts {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /prometheus/api/v1/rules {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
@@ -46,13 +47,13 @@

     \    }\n    location = /loki/api/v1/cache/generation_numbers {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # IndexGateway\n    location = /indexgateway/ring {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # QueryScheduler\n    location = /scheduler/ring {\n      proxy_pass\
     \       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
-    \    }\n\n    # Config\n    location = /config {\n      proxy_pass       http://loki-backend.observability.svc.cluster.local:3100$request_uri;\n\
+    \    }\n\n    # Config\n    location = /config {\n      proxy_pass       http://loki-write.observability.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n\n    # QueryFrontend, Querier\n    location = /api/prom/tail {\n  \
     \    proxy_pass       http://loki-read.observability.svc.cluster.local:3100$request_uri;\n\
     \      proxy_set_header Upgrade $http_upgrade;\n      proxy_set_header Connection\
     \ \"upgrade\";\n    }\n    location = /loki/api/v1/tail {\n      proxy_pass  \
     \     http://loki-read.observability.svc.cluster.local:3100$request_uri;\n   \
     \   proxy_set_header Upgrade $http_upgrade;\n      proxy_set_header Connection\
--- HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-1

+++ HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-1

@@ -1,25 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-1
-  namespace: observability
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: '1'
-  annotations:
-    grafana_folder: Loki
-data:
-  loki-chunks.json: |
[Diff truncated by flux-local]
--- HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-2

+++ HelmRelease: observability/loki ConfigMap: observability/loki-dashboards-2

@@ -1,25 +0,0 @@

----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: loki-dashboards-2
-  namespace: observability
-  labels:
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/instance: loki
-    app.kubernetes.io/managed-by: Helm
-    grafana_dashboard: '1'
-  annotations:
-    grafana_folder: Loki
-data:
-  loki-reads-resources.json: |
[Diff truncated by flux-local]
--- HelmRelease: observability/loki Service: observability/loki-gateway

+++ HelmRelease: observability/loki Service: observability/loki-gateway

@@ -9,15 +9,15 @@

     app.kubernetes.io/instance: loki
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/component: gateway
 spec:
   type: ClusterIP
   ports:
-  - name: http
+  - name: http-metrics
     port: 80
-    targetPort: http
+    targetPort: http-metrics
     protocol: TCP
   selector:
     app.kubernetes.io/name: loki
     app.kubernetes.io/instance: loki
     app.kubernetes.io/component: gateway
 
--- HelmRelease: observability/loki Deployment: observability/loki-gateway

+++ HelmRelease: observability/loki Deployment: observability/loki-gateway

@@ -36,19 +36,19 @@

       terminationGracePeriodSeconds: 30
       containers:
       - name: nginx
         image: ghcr.io/nginxinc/nginx-unprivileged:1.24-alpine
         imagePullPolicy: IfNotPresent
         ports:
-        - name: http
+        - name: http-metrics
           containerPort: 8080
           protocol: TCP
         readinessProbe:
           httpGet:
             path: /
-            port: http
+            port: http-metrics
           initialDelaySeconds: 15
           timeoutSeconds: 1
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -64,14 +64,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: gateway
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: config
         configMap:
           name: loki-gateway
--- HelmRelease: observability/loki Deployment: observability/loki-read

+++ HelmRelease: observability/loki Deployment: observability/loki-read

@@ -37,13 +37,13 @@

         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       terminationGracePeriodSeconds: 30
       containers:
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=read
         - -legacy-read-mode=false
         - -common.compactor-grpc-address=loki-backend.observability.svc.cluster.local:9095
@@ -83,14 +83,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: read
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: tmp
         emptyDir: {}
       - name: data
--- HelmRelease: observability/loki StatefulSet: observability/loki-backend

+++ HelmRelease: observability/loki StatefulSet: observability/loki-backend

@@ -62,13 +62,13 @@

         - name: LOG_LEVEL
           value: INFO
         volumeMounts:
         - name: sc-rules-volume
           mountPath: /rules
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=backend
         - -legacy-read-mode=false
         ports:
@@ -111,14 +111,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: backend
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: tmp
         emptyDir: {}
       - name: config
--- HelmRelease: observability/loki StatefulSet: observability/loki-write

+++ HelmRelease: observability/loki StatefulSet: observability/loki-write

@@ -39,13 +39,13 @@

         runAsGroup: 10001
         runAsNonRoot: true
         runAsUser: 10001
       terminationGracePeriodSeconds: 300
       containers:
       - name: loki
-        image: docker.io/grafana/loki:2.9.6
+        image: docker.io/grafana/loki:3.0.0
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=write
         ports:
         - name: http-metrics
@@ -79,14 +79,12 @@

         resources: {}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchLabels:
-                app.kubernetes.io/name: loki
-                app.kubernetes.io/instance: loki
                 app.kubernetes.io/component: write
             topologyKey: kubernetes.io/hostname
       volumes:
       - name: config
         configMap:
           name: loki
--- HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-chunks-cache

+++ HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-chunks-cache

@@ -0,0 +1,18 @@

+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: loki-memcached-chunks-cache
+  namespace: observability
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-chunks-cache
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-chunks-cache
+  maxUnavailable: 1
+
--- HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-results-cache

+++ HelmRelease: observability/loki PodDisruptionBudget: observability/loki-memcached-results-cache

@@ -0,0 +1,18 @@

+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: loki-memcached-results-cache
+  namespace: observability
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-results-cache
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-results-cache
+  maxUnavailable: 1
+
--- HelmRelease: observability/loki Service: observability/loki-chunks-cache

+++ HelmRelease: observability/loki Service: observability/loki-chunks-cache

@@ -0,0 +1,26 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-chunks-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-chunks-cache
+  namespace: observability
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - name: memcached-client
+    port: 11211
+    targetPort: 11211
+  - name: http-metrics
+    port: 9150
+    targetPort: 9150
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-chunks-cache
+
--- HelmRelease: observability/loki Service: observability/loki-results-cache

+++ HelmRelease: observability/loki Service: observability/loki-results-cache

@@ -0,0 +1,26 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-results-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-results-cache
+  namespace: observability
+spec:
+  type: ClusterIP
+  clusterIP: None
+  ports:
+  - name: memcached-client
+    port: 11211
+    targetPort: 11211
+  - name: http-metrics
+    port: 9150
+    targetPort: 9150
+  selector:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/component: memcached-results-cache
+
--- HelmRelease: observability/loki StatefulSet: observability/loki-chunks-cache

+++ HelmRelease: observability/loki StatefulSet: observability/loki-chunks-cache

@@ -0,0 +1,88 @@

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: loki-chunks-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-chunks-cache
+    name: memcached-chunks-cache
+  namespace: observability
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-chunks-cache
+      name: memcached-chunks-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: loki-chunks-cache
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/instance: loki
+        app.kubernetes.io/component: memcached-chunks-cache
+        name: memcached-chunks-cache
+      annotations: null
+    spec:
+      serviceAccountName: loki
+      securityContext: {}
+      initContainers: []
+      nodeSelector: {}
+      affinity: {}
+      topologySpreadConstraints: []
+      tolerations: []
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: memcached
+        image: memcached:1.6.23-alpine
+        imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 9830Mi
+          requests:
+            cpu: 500m
+            memory: 9830Mi
+        ports:
+        - containerPort: 11211
+          name: client
+        args:
+        - -m 8192
+        - --extended=modern,track_sizes
+        - -I 5m
+        - -c 16384
+        - -v
+        - -u 11211
+        env: null
+        envFrom: null
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      - name: exporter
+        image: prom/memcached-exporter:v0.14.2
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 9150
+          name: http-metrics
+        args:
+        - --memcached.address=localhost:11211
+        - --web.listen-address=0.0.0.0:9150
+        resources:
+          limits: {}
+          requests: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+
--- HelmRelease: observability/loki StatefulSet: observability/loki-results-cache

+++ HelmRelease: observability/loki StatefulSet: observability/loki-results-cache

@@ -0,0 +1,88 @@

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: loki-results-cache
+  labels:
+    app.kubernetes.io/name: loki
+    app.kubernetes.io/instance: loki
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/component: memcached-results-cache
+    name: memcached-results-cache
+  namespace: observability
+spec:
+  podManagementPolicy: Parallel
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: loki
+      app.kubernetes.io/instance: loki
+      app.kubernetes.io/component: memcached-results-cache
+      name: memcached-results-cache
+  updateStrategy:
+    type: RollingUpdate
+  serviceName: loki-results-cache
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: loki
+        app.kubernetes.io/instance: loki
+        app.kubernetes.io/component: memcached-results-cache
+        name: memcached-results-cache
+      annotations: null
+    spec:
+      serviceAccountName: loki
+      securityContext: {}
+      initContainers: []
+      nodeSelector: {}
+      affinity: {}
+      topologySpreadConstraints: []
+      tolerations: []
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: memcached
+        image: memcached:1.6.23-alpine
+        imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 1229Mi
+          requests:
+            cpu: 500m
+            memory: 1229Mi
+        ports:
+        - containerPort: 11211
+          name: client
+        args:
+        - -m 1024
+        - --extended=modern,track_sizes
+        - -I 5m
+        - -c 16384
+        - -v
+        - -u 11211
+        env: null
+        envFrom: null
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      - name: exporter
+        image: prom/memcached-exporter:v0.14.2
+        imagePullPolicy: IfNotPresent
+        ports:
+        - containerPort: 9150
+          name: http-metrics
+        args:
+        - --memcached.address=localhost:11211
+        - --web.listen-address=0.0.0.0:9150
+        resources:
+          limits: {}
+          requests: {}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+

@onedr0p onedr0p merged commit 339b461 into main Apr 8, 2024
12 checks passed
@onedr0p onedr0p deleted the revert-7336-revert-7335-renovate/main-loki-6.x branch April 8, 2024 22:59
onedr0p added a commit that referenced this pull request Apr 8, 2024
@onedr0p
Revert "Revert "Revert "feat(helm)!: Update loki ( 5.47.2 → 6.0.0 )"" (…
04d0a18 
…#7339)"

This reverts commit 339b461.
@onedr0p onedr0p mentioned this pull request Apr 8, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/kubernetes Changes made in the kubernetes directory
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@onedr0p