Merge pull request #2 from sighupio/feat/move-tempo-config-on-a-gener…

…ator feat: release 1.0.2, change how the configmap for tempo is generated
sighupio · Jan 9, 2024 · e074df9 · e074df9
2 parents 1ea5f1c + d5dfee6
commit e074df9
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 151 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
     Kubernetes Fury Tracing
 </h1>
 
-![Release](https://img.shields.io/badge/Latest%20Release-v1.0.1-blue)
+![Release](https://img.shields.io/badge/Latest%20Release-v1.0.2-blue)
 ![License](https://img.shields.io/github/license/sighupio/fury-kubernetes-tracing?label=License)
 ![Slack](https://img.shields.io/badge/slack-@kubernetes/fury-yellow.svg?logo=slack&label=Slack)
 
@@ -53,7 +53,7 @@ Check the [compatibility matrix][compatibility-matrix] for additional informatio
 ```yaml
 bases:
   - name: tracing
-    version: "v1.0.1"
+    version: "v1.0.2"
 ```
 
 > See `furyctl` [documentation][furyctl-repo] for additional details about `Furyfile.yml` format.

diff --git a/docs/COMPATIBILITY_MATRIX.md b/docs/COMPATIBILITY_MATRIX.md
@@ -3,6 +3,9 @@
 | Module Version / Kubernetes Version | 1.26.X             | 1.27.X             |
 | ----------------------------------- | ------------------ | ------------------ |
 | v1.0.0                              | :white_check_mark: | :white_check_mark: |
+| v1.0.1                              | :white_check_mark: | :white_check_mark: |
+| v1.0.2                              | :white_check_mark: | :white_check_mark: |
+
 
 - :white_check_mark: Compatible
 - :warning: Has issues

diff --git a/docs/releases/v1.0.2.md b/docs/releases/v1.0.2.md
@@ -0,0 +1,23 @@
+# Tracing Core Module Release 1.0.2
+
+Welcome to the latest release of the `tracing` module of [`Kubernetes Fury Distribution`](https://github.com/sighupio/fury-distribution) maintained by team SIGHUP.
+
+This patch release changes how kustomize generate the configMap for tempo, using a generator.
+
+## Component Images 🚢
+
+| Component           | Supported Version                                                                                   | Previous Version |
+| ------------------- | --------------------------------------------------------------------------------------------------- | ---------------- |
+| `tempo-distributed` | [`v2.3.1`](https://github.com/grafana/tempo/releases/tag/v2.3.1)                                    | `No Update`      |
+| `minio-ha`          | [`vRELEASE.2023-01-12T02-06-16Z`](https://github.com/minio/minio/tree/RELEASE.2023-01-12T02-06-16Z) | `No Update`      |
+
+## Update Guide 🦮
+
+### Process
+
+To upgrade the module run:
+
+```bash
+kustomize build | kubectl apply -f -
+```
+
diff --git a/katalog/tempo-distributed/configs/tempo.yaml b/katalog/tempo-distributed/configs/tempo.yaml
@@ -0,0 +1,133 @@
+# Copyright (c) 2020 SIGHUP s.r.l All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+compactor:
+  compaction:
+    block_retention: 48h
+    compacted_block_retention: 1h
+    compaction_cycle: 30s
+    compaction_window: 1h
+    max_block_bytes: 107374182400
+    max_compaction_objects: 6000000
+    max_time_per_tenant: 5m
+    retention_concurrency: 10
+    v2_in_buffer_bytes: 5242880
+    v2_out_buffer_bytes: 20971520
+    v2_prefetch_traces_count: 1000
+  ring:
+    kvstore:
+      store: memberlist
+distributor:
+  receivers:
+    jaeger:
+      protocols:
+        grpc:
+          endpoint: 0.0.0.0:14250
+        thrift_binary:
+          endpoint: 0.0.0.0:6832
+        thrift_compact:
+          endpoint: 0.0.0.0:6831
+        thrift_http:
+          endpoint: 0.0.0.0:14268
+    opencensus:
+      endpoint: 0.0.0.0:55678
+    otlp:
+      protocols:
+        grpc:
+          endpoint: 0.0.0.0:4317
+        http:
+          endpoint: 0.0.0.0:4318
+    zipkin:
+      endpoint: 0.0.0.0:9411
+  ring:
+    kvstore:
+      store: memberlist
+ingester:
+  lifecycler:
+    ring:
+      kvstore:
+        store: memberlist
+      replication_factor: 3
+    tokens_file_path: /var/tempo/tokens.json
+memberlist:
+  abort_if_cluster_join_fails: false
+  bind_addr: []
+  bind_port: 7946
+  gossip_interval: 1s
+  gossip_nodes: 2
+  gossip_to_dead_nodes_time: 30s
+  join_members:
+  - dns+tempo-distributed-gossip-ring:7946
+  leave_timeout: 5s
+  left_ingesters_timeout: 5m
+  max_join_backoff: 1m
+  max_join_retries: 10
+  min_join_backoff: 1s
+  node_name: ""
+  packet_dial_timeout: 5s
+  packet_write_timeout: 5s
+  pull_push_interval: 30s
+  randomize_node_name: true
+  rejoin_interval: 0s
+  retransmit_factor: 2
+  stream_timeout: 10s
+multitenancy_enabled: false
+overrides:
+  metrics_generator_processors: []
+  per_tenant_override_config: /runtime-config/overrides.yaml
+querier:
+  frontend_worker:
+    frontend_address: tempo-distributed-query-frontend-discovery:9095
+  max_concurrent_queries: 20
+  search:
+    external_backend: null
+    external_endpoints: []
+    external_hedge_requests_at: 8s
+    external_hedge_requests_up_to: 2
+    prefer_self: 10
+    query_timeout: 30s
+  trace_by_id:
+    query_timeout: 10s
+query_frontend:
+  max_retries: 2
+  search:
+    concurrent_jobs: 1000
+    target_bytes_per_job: 104857600
+  trace_by_id:
+    hedge_requests_at: 2s
+    hedge_requests_up_to: 2
+    query_shards: 50
+server:
+  grpc_server_max_recv_msg_size: 4194304
+  grpc_server_max_send_msg_size: 4194304
+  http_listen_port: 3100
+  http_server_read_timeout: 30s
+  http_server_write_timeout: 30s
+  log_format: logfmt
+  log_level: info
+storage:
+  trace:
+    backend: s3
+    blocklist_poll: 5m
+    cache: memcached
+    local:
+      path: /var/tempo/traces
+    memcached:
+      consistent_hash: true
+      host: tempo-distributed-memcached
+      service: memcached-client
+      timeout: 500ms
+    pool:
+      max_workers: 400
+      queue_depth: 20000
+    s3:
+      access_key: minio
+      bucket: tempo
+      endpoint: minio-tracing:9000
+      insecure: true
+      secret_key: minio123
+    wal:
+      path: /var/tempo/wal
+usage_report:
+  reporting_enabled: true
diff --git a/katalog/tempo-distributed/deploy.yaml b/katalog/tempo-distributed/deploy.yaml
@@ -55,154 +55,6 @@ data:
     
     overrides: {}
 ---
-# Source: tempo-distributed/templates/configmap-tempo.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: tempo-distributed-config
-  labels:
-    helm.sh/chart: tempo-distributed-1.7.3
-    app.kubernetes.io/name: tempo
-    app.kubernetes.io/instance: tempo-distributed
-    app.kubernetes.io/version: "2.3.1"
-    app.kubernetes.io/managed-by: Helm
-  namespace: "tracing"
-data:
-  tempo-query.yaml: |
-    backend: 127.0.0.1:3100
-    
-  tempo.yaml: |
-    
-    compactor:
-      compaction:
-        block_retention: 48h
-        compacted_block_retention: 1h
-        compaction_cycle: 30s
-        compaction_window: 1h
-        max_block_bytes: 107374182400
-        max_compaction_objects: 6000000
-        max_time_per_tenant: 5m
-        retention_concurrency: 10
-        v2_in_buffer_bytes: 5242880
-        v2_out_buffer_bytes: 20971520
-        v2_prefetch_traces_count: 1000
-      ring:
-        kvstore:
-          store: memberlist
-    distributor:
-      receivers:
-        jaeger:
-          protocols:
-            grpc:
-              endpoint: 0.0.0.0:14250
-            thrift_binary:
-              endpoint: 0.0.0.0:6832
-            thrift_compact:
-              endpoint: 0.0.0.0:6831
-            thrift_http:
-              endpoint: 0.0.0.0:14268
-        opencensus:
-          endpoint: 0.0.0.0:55678
-        otlp:
-          protocols:
-            grpc:
-              endpoint: 0.0.0.0:4317
-            http:
-              endpoint: 0.0.0.0:4318
-        zipkin:
-          endpoint: 0.0.0.0:9411
-      ring:
-        kvstore:
-          store: memberlist
-    ingester:
-      lifecycler:
-        ring:
-          kvstore:
-            store: memberlist
-          replication_factor: 3
-        tokens_file_path: /var/tempo/tokens.json
-    memberlist:
-      abort_if_cluster_join_fails: false
-      bind_addr: []
-      bind_port: 7946
-      gossip_interval: 1s
-      gossip_nodes: 2
-      gossip_to_dead_nodes_time: 30s
-      join_members:
-      - dns+tempo-distributed-gossip-ring:7946
-      leave_timeout: 5s
-      left_ingesters_timeout: 5m
-      max_join_backoff: 1m
-      max_join_retries: 10
-      min_join_backoff: 1s
-      node_name: ""
-      packet_dial_timeout: 5s
-      packet_write_timeout: 5s
-      pull_push_interval: 30s
-      randomize_node_name: true
-      rejoin_interval: 0s
-      retransmit_factor: 2
-      stream_timeout: 10s
-    multitenancy_enabled: false
-    overrides:
-      metrics_generator_processors: []
-      per_tenant_override_config: /runtime-config/overrides.yaml
-    querier:
-      frontend_worker:
-        frontend_address: tempo-distributed-query-frontend-discovery:9095
-      max_concurrent_queries: 20
-      search:
-        external_backend: null
-        external_endpoints: []
-        external_hedge_requests_at: 8s
-        external_hedge_requests_up_to: 2
-        prefer_self: 10
-        query_timeout: 30s
-      trace_by_id:
-        query_timeout: 10s
-    query_frontend:
-      max_retries: 2
-      search:
-        concurrent_jobs: 1000
-        target_bytes_per_job: 104857600
-      trace_by_id:
-        hedge_requests_at: 2s
-        hedge_requests_up_to: 2
-        query_shards: 50
-    server:
-      grpc_server_max_recv_msg_size: 4194304
-      grpc_server_max_send_msg_size: 4194304
-      http_listen_port: 3100
-      http_server_read_timeout: 30s
-      http_server_write_timeout: 30s
-      log_format: logfmt
-      log_level: info
-    storage:
-      trace:
-        backend: s3
-        blocklist_poll: 5m
-        cache: memcached
-        local:
-          path: /var/tempo/traces
-        memcached:
-          consistent_hash: true
-          host: tempo-distributed-memcached
-          service: memcached-client
-          timeout: 500ms
-        pool:
-          max_workers: 400
-          queue_depth: 20000
-        s3:
-          access_key: minio
-          bucket: tempo
-          endpoint: minio-tracing:9000
-          insecure: true
-          secret_key: minio123
-        wal:
-          path: /var/tempo/wal
-    usage_report:
-      reporting_enabled: true
----
 # Source: tempo-distributed/templates/gateway/configmap-gateway.yaml
 apiVersion: v1
 kind: ConfigMap

diff --git a/katalog/tempo-distributed/kustomization.yaml b/katalog/tempo-distributed/kustomization.yaml
@@ -23,4 +23,10 @@ images:
     newTag: "2.3.1"
   - name: docker.io/nginxinc/nginx-unprivileged
     newName: registry.sighup.io/fury/nginxinc/nginx-unprivileged
-    newTag: "1.25-alpine"
+    newTag: "1.25-alpine"
+
+configMapGenerator:
+  - name: tempo-distributed-config
+    namespace: tracing
+    files:
+      - configs/tempo.yaml