Merge pull request #82 from SigNoz/prashant/enable-k8s-infra

enable k8s-infra and release signoz chart v0.4.0
SigNoz · Sep 19, 2022 · 544aa0f · 544aa0f
2 parents 2ce4607 + 93b5dba
commit 544aa0f
Show file tree

Hide file tree

Showing 19 changed files with 206 additions and 68 deletions.
diff --git a/charts/clickhouse/.helmignore b/charts/clickhouse/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/clickhouse/values.yaml b/charts/clickhouse/values.yaml
@@ -152,14 +152,16 @@ tolerations: []
 affinity: {}
 # -- node selector for settings for clickhouse pod
 nodeSelector: {}
-# -- Clickhouse resource requests/limits. See more at http://kubernetes.io/docs/user-guide/compute-resources/
+# -- Configure resource requests and limits. Update according to your own use
+# case as these values might be too low for a typical deployment.
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
 resources: {}
-#   limits:
-#     cpu: 1000m
-#     memory: 16Gi
-#   requests:
-#     cpu: 4000m
-#     memory: 16Gi
+  #   requests:
+  #     cpu: 1000m
+  #     memory: 4Gi
+  #   limits:
+  #     cpu: 4000m
+  #     memory: 16Gi
 
 # -- Security context for Clickhouse node
 securityContext:

diff --git a/charts/k8s-infra/values.yaml b/charts/k8s-infra/values.yaml
@@ -258,11 +258,11 @@ otelAgent:
   # @default -- See `values.yaml` for defaults
   resources:
     requests:
-      cpu: 200m
-      memory: 200Mi
-    limits:
-      cpu: 1000m
-      memory: 1Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 1Gi
 
   # -- OtelAgent node selector
   nodeSelector: {}
@@ -612,11 +612,11 @@ otelDeployment:
   # @default -- See `values.yaml` for defaults
   resources:
     requests:
-      cpu: 200m
-      memory: 200Mi
-    limits:
-      cpu: 1000m
-      memory: 1Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 1Gi
 
   # -- OtelDeployment node selector
   nodeSelector: {}

diff --git a/charts/signoz/Chart.lock b/charts/signoz/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
 - name: clickhouse
   repository: https://signoz.github.io/charts
-  version: 23.5.2
-digest: sha256:aec8ee51c6dd2d62a194294bb8a21b7a7bd94ae08ec5908dcf9588ba782500c5
-generated: "2022-09-05T14:39:27.092108478+05:30"
+  version: 23.5.3
+- name: k8s-infra
+  repository: https://signoz.github.io/charts
+  version: 0.1.1
+digest: sha256:93b7e038ab092cef0258fb896ed099851332693b872ebba846d6026d571ca392
+generated: "2022-09-15T21:42:03.603868236+05:30"
diff --git a/charts/signoz/Chart.yaml b/charts/signoz/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: signoz
-version: 0.3.3
-appVersion: "0.11.0"
+version: 0.4.0
+appVersion: "0.11.1"
 description: SigNoz Observability Platform Helm Chart
 type: application
 home: https://signoz.io/
@@ -13,15 +13,19 @@ keywords:
   - monitoring
   - distributed tracing
 sources:
-  - https://github.com/signoz/charts/
+  - https://github.com/signoz/charts
   - https://github.com/signoz/signoz
   - https://github.com/signoz/alertmanager
-  - https://github.com/signoz/opentelemetry-collector-contrib
+  - https://github.com/signoz/signoz-otel-collector
 dependencies:
   - name: clickhouse
     repository: "https://signoz.github.io/charts"
     condition: clickhouse.enabled
-    version: 23.5.2
+    version: 23.5.3
+  - name: k8s-infra
+    repository: "https://signoz.github.io/charts"
+    condition: k8s-infra.enabled
+    version: 0.1.1
 maintainers:
   - name: SigNoz
     email: [email protected]

diff --git a/charts/signoz/README.md b/charts/signoz/README.md
@@ -71,7 +71,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `queryService.name`                      | Query Service component name                                            | `query-service`                   |
 | `queryService.image.registry`            | Query Service image registry name                                       | `docker.io`                       |
 | `queryService.image.repository`          | Container image name                                                    | `signoz/query-service`            |
-| `queryService.image.tag`                 | Container image tag                                                     | `0.11.0`                          |
+| `queryService.image.tag`                 | Container image tag                                                     | `0.11.1`                          |
 | `queryService.image.pullPolicy`          | Container pull policy                                                   | `IfNotPresent`                    |
 | `queryService.replicaCount`              | Number of query-service nodes                                           | `1`                               |
 | `queryService.initContainers.init.enabled`      | Query Service initContainer enabled                              | `true`                            |
@@ -103,7 +103,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `frontend.name`                          | Frontend component name                                                 | `frontend`                        |
 | `frontend.image.registry`                | Frontend image registry name                                            | `docker.io`                       |
 | `frontend.image.repository`              | Container image name                                                    | `signoz/frontend`                 |
-| `frontend.image.tag`                     | Container image tag                                                     | `0.11.0`                          |
+| `frontend.image.tag`                     | Container image tag                                                     | `0.11.1`                          |
 | `frontend.image.pullPolicy`              | Container pull policy                                                   | `IfNotPresent`                    |
 | `frontend.replicaCount`                  | Number of query-service nodes                                           | `1`                               |
 | `frontend.initContainers.init.enabled`   | Frontend initContainer enabled                                          | `true`                            |
@@ -173,7 +173,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `otelCollector.name`                     | Otel Collector component name                                           | `otel-collector`                  |
 | `otelCollector.image.registry`           | Otel Collector image registry name                                      | `docker.io`                       |
 | `otelCollector.image.repository`         | Container image name                                                    | `signoz/signoz-otel-collector`    |
-| `otelCollector.image.tag`                | Container image tag                                                     | `0.55.0`                          |
+| `otelCollector.image.tag`                | Container image tag                                                     | `0.55.1`                          |
 | `otelCollector.image.pullPolicy`         | Container pull policy                                                   | `IfNotPresent`                    |
 | `otelCollector.replicaCount`             | Number of otel-collector nodes                                          | `1`                               |
 | `otelCollector.service.type`             | Otel Collector service type                                             | `ClusterIP`                       |
@@ -208,7 +208,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `otelCollectorMetrics.name`              | Otel Collector Metrics component name                                   | `otel-collector-metrics`          |
 | `otelCollectorMetrics.image.registry`    | Otel Collector Metrics image registry name                              | `docker.io`                       |
 | `otelCollectorMetrics.image.repository`  | Container image name                                                    | `signoz/signoz-otel-collector`    |
-| `otelCollectorMetrics.image.tag`         | Container image tag                                                     | `0.55.0`                          |
+| `otelCollectorMetrics.image.tag`         | Container image tag                                                     | `0.55.1`                          |
 | `otelCollectorMetrics.image.pullPolicy`  | Container pull policy                                                   | `IfNotPresent`                    |
 | `otelCollectorMetrics.replicaCount`      | Number of otel-collector-metrics nodes                                  | `1`                               |
 | `otelCollectorMetrics.service.type`         | Otel Collector service type                                          | `ClusterIP`                       |

diff --git a/charts/signoz/charts/clickhouse-23.5.2.tgz b/charts/signoz/charts/clickhouse-23.5.2.tgz
diff --git a/charts/signoz/charts/clickhouse-23.5.3.tgz b/charts/signoz/charts/clickhouse-23.5.3.tgz
diff --git a/charts/signoz/charts/k8s-infra-0.1.1.tgz b/charts/signoz/charts/k8s-infra-0.1.1.tgz
diff --git a/charts/signoz/templates/_helpers.tpl b/charts/signoz/templates/_helpers.tpl
@@ -503,6 +503,7 @@ nodePort: null
 {{- end -}}
 
 {{/*
+Return structured list of ports config.
 */}}
 {{- define "otelCollector.portsConfig" -}}
 {{- $serviceType := deepCopy .service.type -}}

diff --git a/charts/signoz/templates/frontend/config.yaml → .../signoz/templates/frontend/configmap.yaml b/charts/signoz/templates/frontend/config.yaml → .../signoz/templates/frontend/configmap.yaml
diff --git a/charts/signoz/templates/frontend/deployment.yaml b/charts/signoz/templates/frontend/deployment.yaml
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/frontend/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/frontend/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "frontend.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/...plates/otel-collector-metrics/config.yaml → ...tes/otel-collector-metrics/configmap.yaml b/...plates/otel-collector-metrics/config.yaml → ...tes/otel-collector-metrics/configmap.yaml
diff --git a/charts/signoz/templates/otel-collector-metrics/deployment.yaml b/charts/signoz/templates/otel-collector-metrics/deployment.yaml
@@ -21,7 +21,7 @@ spec:
         {{- if .Values.otelCollectorMetrics.podAnnotations -}}
           {{- toYaml .Values.otelCollectorMetrics.podAnnotations | nindent 8 -}}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/otel-collector-metrics/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/otel-collector-metrics/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "otelCollectorMetrics.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/charts/signoz/templates/otel-collector-metrics/service.yaml b/charts/signoz/templates/otel-collector-metrics/service.yaml
@@ -5,10 +5,10 @@ metadata:
   labels:
     {{- include "otelCollectorMetrics.labels" . | nindent 4 }}
 {{- with .Values.otelCollectorMetrics }}
-{{- if .annotations }}
+  {{- if .service.annotations }}
   annotations:
-    {{- toYaml .annotations | nindent 4 }}
-{{- end }}
+    {{- toYaml .service.annotations | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .service.type }}
   ports:

diff --git a/...gnoz/templates/otel-collector/config.yaml → ...z/templates/otel-collector/configmap.yaml b/...gnoz/templates/otel-collector/config.yaml → ...z/templates/otel-collector/configmap.yaml
diff --git a/charts/signoz/templates/otel-collector/deployment.yaml b/charts/signoz/templates/otel-collector/deployment.yaml
@@ -23,7 +23,7 @@ spec:
         {{- if .Values.otelCollector.podAnnotations -}}
           {{- toYaml .Values.otelCollector.podAnnotations | nindent 8 -}}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/otel-collector/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/otel-collector/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "otelCollector.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/charts/signoz/templates/query-service/configmap.yaml b/charts/signoz/templates/query-service/configmap.yaml
@@ -25,8 +25,7 @@ data:
 
     # A scrape configuration containing exactly one endpoint to scrape:
     # Here it's Prometheus itself.
-    scrape_configs:
-      
+    scrape_configs: []
 
     remote_read:
       - url: tcp://{{ include "clickhouse.metricsUrl" . }}