Refactoring helm for open-telemetry-collector

helm-templates/open-telemetry-collector/templates/HorizontalPodAutoscaler.yaml → charts/open-telemetry-collector/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 }}

helm-templates/open-telemetry-collector/templates/deployment.yaml → charts/open-telemetry-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

helm-templates/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: []

docker-transfer/Dockerfile

@@ -1,5 +1,5 @@
 FROM scratch
 
 # Collect helm charts and documentation
-COPY helm-templates/ /helm-templates
+COPY charts/ /charts
 COPY docs/ /docs