Refactoring helm for open-telemetry-collector

Netcracker · Jan 24, 2025 · b75edcb · b75edcb
1 parent f1c3cf9
commit b75edcb
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 262 deletions.
diff --git a/...lates/open-telemetry-collector/Chart.yaml → charts/open-telemetry-collector/Chart.yaml b/...lates/open-telemetry-collector/Chart.yaml → charts/open-telemetry-collector/Chart.yaml
diff --git a/...or/templates/HorizontalPodAutoscaler.yaml → ...or/templates/HorizontalPodAutoscaler.yaml b/...or/templates/HorizontalPodAutoscaler.yaml → ...or/templates/HorizontalPodAutoscaler.yaml
@@ -29,7 +29,7 @@ spec:
         name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ int (divf (mulf (default 75 .Values.HPA_AVG_CPU_UTILIZATION_TARGET_PERCENT) (include "to_millicores" .Values.CPU_LIMIT)) (include "to_millicores" .Values.CPU_REQUEST)) }}
+          averageUtilization: {{ int (divf (mulf (default 75 .Values.HPA_AVG_CPU_UTILIZATION_TARGET_PERCENT) (include "to_millicores" .Values.resources.limits.cpu)) (include "to_millicores" .Values.resources.requests.cpu)) }}
   behavior:
     scaleUp:
       stabilizationWindowSeconds: {{ default 0 .Values.HPA_SCALING_UP_STABILIZATION_WINDOW_SECONDS }}

diff --git a/...elemetry-collector/templates/Ingress.yaml → ...elemetry-collector/templates/Ingress.yaml b/...elemetry-collector/templates/Ingress.yaml → ...elemetry-collector/templates/Ingress.yaml
diff --git a/...elemetry-collector/templates/_helpers.tpl → ...elemetry-collector/templates/_helpers.tpl b/...elemetry-collector/templates/_helpers.tpl → ...elemetry-collector/templates/_helpers.tpl
diff --git a/...metry-collector/templates/deployment.yaml → ...metry-collector/templates/deployment.yaml b/...metry-collector/templates/deployment.yaml → ...metry-collector/templates/deployment.yaml
@@ -103,7 +103,7 @@ spec:
       containers:
         - name: opentelemetry-collector
           command: ["{{ .Values.entrypoint }}","--config", "/conf/otel.yaml"]
-          image: '{{ .Values.IMAGE_REPOSITORY }}:{{ .Values.TAG }}'
+          image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}'
           ports:
             - name: jaeger-compact
               containerPort: 6831
@@ -143,11 +143,11 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- else }}
             limits:
-              cpu: '{{ .Values.CPU_LIMIT }}'
-              memory: '{{ .Values.MEMORY_LIMIT }}'
+              cpu: '{{ .Values.resources.limits.cpu }}'
+              memory: '{{ .Values.resources.limits.memory }}'
             requests:
-              cpu: '{{ .Values.CPU_REQUEST }}'
-              memory: '{{ .Values.MEMORY_REQUEST }}'
+              cpu: '{{ .Values.resources.requests.cpu }}'
+              memory: '{{ .Values.resources.requests.memory }}'
           {{- end }}
           volumeMounts:
             - name: opentelemetry-collector-vol
@@ -183,6 +183,7 @@ spec:
               path: /
               port: {{ .Values.OTEC_HEALTH_CHECK_PORT }}
               scheme: HTTP
+            initialDelaySeconds: 3
             timeoutSeconds: 1
             periodSeconds: 10
             successThreshold: 1
@@ -192,6 +193,7 @@ spec:
           imagePullPolicy: IfNotPresent
           securityContext:
             {{- if eq .Values.PAAS_PLATFORM "KUBERNETES" }}
+            runAsUser: 10001
             runAsGroup: 10001
             {{- end }}
             readOnlyRootFilesystem: true

diff --git a/...r/templates/metrics_collector_config.yaml → ...r/templates/metrics_collector_config.yaml b/...r/templates/metrics_collector_config.yaml → ...r/templates/metrics_collector_config.yaml
diff --git a/...-collector/templates/service-monitor.yaml → ...-collector/templates/service-monitor.yaml b/...-collector/templates/service-monitor.yaml → ...-collector/templates/service-monitor.yaml
diff --git a/...elemetry-collector/templates/service.yaml → ...elemetry-collector/templates/service.yaml b/...elemetry-collector/templates/service.yaml → ...elemetry-collector/templates/service.yaml
diff --git a/...ates/open-telemetry-collector/values.yaml → charts/open-telemetry-collector/values.yaml b/...ates/open-telemetry-collector/values.yaml → charts/open-telemetry-collector/values.yaml
@@ -56,7 +56,24 @@ OTEC_LOGTCPEXPORTER_PARAMETERS:
 # Type: object
 # Mandatory: no
 # Default:
-resources: ''
+resources:
+  requests:
+    cpu: 100m
+    memory: 100Mi
+  limits:
+    cpu: 200m
+    memory: 200Mi
+
+# The name of type cloud environment
+# Type: String
+# Possible values: KUBERNETES or OPENSHIFT
+# Default: KUBERNETES
+#
+PAAS_PLATFORM: KUBERNETES
+
+image:
+  repository: ghcr.io/netcracker/qubership-open-telemetry-collector
+  tag: main
 
 # Only pods which provide own keys can access the private registry.
 # Default: []

diff --git a/docs/installation-notes.md b/docs/installation-notes.md
diff --git a/helm-templates/open-telemetry-collector/values.schema.json b/helm-templates/open-telemetry-collector/values.schema.json