Merge pull request #25 from aspecto-io/no-limits-support

no limit + hpa support

Author: kobi-co

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Run chart unittest
         run: |
-          helm plugin install https://github.com/quintush/helm-unittest
+          helm plugin install https://github.com/quintush/helm-unittest --version v0.2.11
           for chart in $(ct list-changed)
           do
             helm unittest --helm3 $chart

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: aspecto-io-opentelemetry-collector
-version: '1.4.10'
+version: '1.4.11'
 home: https://aspecto.io
 type: application
 description: helm chart of aspecto's opentelemetry tail sampling collector

charts/opentelemetry-collector/templates/collector/configMap.yaml

@@ -33,7 +33,6 @@ data:
     config_sources:
       aspecto:
         token: ${token}
-        interval: {{ .Values.global.aspecto.interval | default 10 }}
       {{- if .Values.redis.enabled }}
         redis:
           address: {{ include "get-redis-endpoint" . }}
@@ -48,7 +47,7 @@ data:
           {{- include "collector.reciver.protocol.otlp" (dict "service" "http" "protocols" .Values.global.collector_services "localListenerIp" .Values.receiver.specs.network.localListenerIp ) | nindent 10 }}
           {{- include "collector.reciver.protocol.metrics" (dict "service" "metrics" "protocols" .Values.global.collector_services "localListenerIp" .Values.collector.specs.network.localListenerIp) | indent 4}}
     processors:
-      tail_sampling: $aspecto:tail_sampling
+      tail_sampling: $aspecto:processor:tail_sampling
       resource:
         {{- include "collector.configMap.processors.resource" (dict "environment" .Values.global.aspecto.environment) | indent 6 }}
       batch:

charts/opentelemetry-collector/templates/collector/deployment.yaml

@@ -14,7 +14,8 @@
 {{- $globalSubAnnotations := $globalMetadata.pod.annotations }}
 {{- $localSubAnnotations := $localMetadata.pod.annotations -}}
 {{- $localSubLabels := $localMetadata.pod.labels -}}
-
+{{- $resources := .Values.collector.specs.resources -}}
+{{- if .Values.global.ignoreCpuLimits }}{{ $_ := unset $resources.limits "cpu" }}{{- end }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -55,6 +56,9 @@ spec:
       {{- if .Values.collector.serviceAccount.enabled }}
       {{ toYaml .Values.collector.serviceAccount.containerConfig | nindent 6}}
       {{- end }}
+      {{- if .Values.collector.metadata.deployment.customConfig }}
+      {{ toYaml .Values.collector.metadata.deployment.customConfig | nindent 6 }}
+      {{- end }}
       containers:
         - name: "{{ .Values.global.name }}-{{ .Values.collector.metadata.name }}"
           image: "{{ .Values.collector.image.repository | default .Values.global.image.repository }}/{{ .Values.collector.image.name | default .Values.global.image.name }}:{{ .Values.collector.image.version | default .Values.global.image.version }}"
@@ -117,4 +121,4 @@ spec:
 {{ toYaml .Values.collector.specs.probe | trim | indent 10}}
           {{- end }}
           resources:
-{{ toYaml .Values.collector.specs.resources | trim | indent 12 }}
+{{ toYaml $resources | trim | indent 12 }}

charts/opentelemetry-collector/templates/collector/hpa.yaml

@@ -10,7 +10,7 @@
 {{- $localObjectLabels := $localMetadata.hpa.labels -}}
 {{- $localListenerIp := .Values.collector.specs.network.localListenerIp -}}
 {{- if .Values.collector.specs.autoscaling.enable }}
-apiVersion: autoscaling/v2beta2
+apiVersion: {{ .Values.global.hpaApiVersion }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ .Values.global.name }}-{{ $localMetadata.name }}-hpa
@@ -46,4 +46,4 @@ spec:
         type: Utilization
         averageUtilization: {{ . }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/opentelemetry-collector/templates/receiver/deployment.yaml

@@ -14,6 +14,8 @@
 {{- $globalSubAnnotations := $globalMetadata.pod.annotations }}
 {{- $localSubAnnotations := $localMetadata.pod.annotations -}}
 {{- $localSubLabels := $localMetadata.pod.labels -}}
+{{- $resources := .Values.receiver.specs.resources -}}
+{{- if .Values.global.ignoreCpuLimits }}{{ $_ := unset $resources.limits "cpu" }}{{- end }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -54,6 +56,9 @@ spec:
       {{- if .Values.receiver.serviceAccount.enabled }}
       {{ toYaml .Values.receiver.serviceAccount.containerConfig | nindent 6 }}
       {{- end }}
+      {{- if .Values.receiver.metadata.deployment.customConfig }}
+      {{ toYaml .Values.receiver.metadata.deployment.customConfig | nindent 6 }}
+      {{- end }}
       containers:
         - name: "{{ .Values.global.name }}-{{ .Values.receiver.metadata.name }}"
           image: "{{ .Values.receiver.image.repository | default .Values.global.image.repository }}/{{ .Values.receiver.image.name | default .Values.global.image.name }}:{{ .Values.receiver.image.version | default .Values.global.image.version }}"
@@ -90,4 +95,4 @@ spec:
 {{ toYaml .Values.receiver.specs.probe | trim | indent 10 }}
           {{- end }}
           resources:
-{{ toYaml .Values.receiver.specs.resources | trim | indent 12 }}
+{{ toYaml $resources | trim | indent 12 }}

charts/opentelemetry-collector/templates/receiver/hpa.yaml

@@ -9,7 +9,7 @@
 {{- $localSharedLabels := $localMetadata.shared.labels -}}
 {{- $localObjectLabels := $localMetadata.hpa.labels -}}
 {{- if .Values.receiver.specs.autoscaling.enable }}
-apiVersion: autoscaling/v2beta2
+apiVersion: {{ .Values.global.hpaApiVersion }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ .Values.global.name }}-{{ $localMetadata.name }}-hpa
@@ -45,4 +45,4 @@ spec:
         type: Utilization
         averageUtilization: {{ . }}
   {{- end }}
-{{- end }}
+{{- end }}

charts/opentelemetry-collector/templates/redis/deployment.yaml

@@ -9,7 +9,8 @@
 {{- $localData := .Values.redis -}}
 {{- $localDataSpec := .Values.redis.specs -}}
 {{- $localMetadata := .Values.redis.metadata -}}
-
+{{- $resources := $localDataSpec.resources -}}
+{{- if .Values.global.ignoreCpuLimits }}{{ $_ := unset $resources.limits "cpu" }}{{- end }}
 {{- if and ($localData.enabled) (eq $localData.config.type "local") }}
 apiVersion: apps/v1
 kind: Deployment
@@ -37,5 +38,5 @@ spec:
           ports:
               - containerPort: {{ $localDataSpec.port }}
           resources:
-{{ toYaml $localDataSpec.resources | trim | indent 12 }}
+{{ toYaml $resources | trim | indent 12 }}
 {{- end }}

charts/opentelemetry-collector/tests/collector_test.yaml

@@ -76,3 +76,33 @@ tests:
     asserts:
       - isKind:
           of: Gateway
+  - it: ignore-cpu-limits-test
+    template: collector/deployment.yaml
+    values:
+      - ../values.yaml
+      - tests_values.yaml
+    set:
+      global.ignoreCpuLimits: true
+    asserts:
+      - isNull:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+  - it: hpa-api-version
+    template: collector/hpa.yaml
+    values:
+      - ../values.yaml
+      - tests_values.yaml
+    asserts:
+      - equal:
+          path: apiVersion
+          value: autoscaling/v2beta2
+  - it: hpa-api-version-override
+    template: collector/hpa.yaml
+    values:
+      - ../values.yaml
+      - tests_values.yaml
+    set:
+      global.hpaApiVersion: autoscaling/v2
+    asserts:
+      - equal:
+          path: apiVersion
+          value: autoscaling/v2

charts/opentelemetry-collector/tests/receiver_test.yaml

@@ -88,3 +88,13 @@ tests:
     asserts:
       - isKind:
           of: Gateway
+  - it: ignore-cpu-limits-test
+    template: receiver/deployment.yaml
+    values:
+      - ../values.yaml
+      - tests_values.yaml
+    set:
+      global.ignoreCpuLimits: true
+    asserts:
+      - isNull:
+          path: spec.template.spec.containers[0].resources.limits.cpu