Merge pull request #47 from lightstep/LS-54634-fix-kos

[LS-54634] Fix logic for HPAs

Author: jaronoff97

.github/workflows/ci.yaml

@@ -64,8 +64,8 @@ jobs:
 
       - name: Run chart-testing kube-otel-state (install)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --config ct.yaml --charts ./charts/kube-otel-stack --namespace opentelemetry --debug
+        run: ct install --config ct.yaml --charts ./charts/kube-otel-stack --helm-extra-set-args="--set=tracesCollector.enabled=true --set=logsCollector.enabled=true" --namespace opentelemetry --debug
 
       - name: Run chart-testing otel-cloud-stack (install)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --config ct.yaml --charts ./charts/otel-cloud-stack --namespace opentelemetry --debug
+        run: ct install --config ct.yaml --charts ./charts/otel-cloud-stack --helm-extra-set-args="--set=tracesCollector.enabled=true --set=logsCollector.enabled=true" --namespace opentelemetry --debug

charts/kube-otel-stack/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: kube-otel-stack
 description: Chart for sending Kubernetes metrics to Lightstep using the OpenTelemetry Operator.
 type: application
-version: 0.3.2
+version: 0.3.3
 appVersion: 0.83.0
 dependencies:
 # cert manager must be manually installed because it has CRDs

charts/kube-otel-stack/templates/collector.yaml

@@ -16,15 +16,17 @@ spec:
   mode: {{ $collector.mode }}
   image: {{ $collector.image }}
   replicas: {{ $collector.replicas | default 1 }}
-  {{- if and $collector.hpa $collector.hpa.enabled }}
+  {{- with $collector.hpa }}
+  {{- if .enabled }}
   autoscaler:
-    minReplicas: {{ $collector.hpa.minReplicas }}
-    maxReplicas: {{ $collector.hpa.maxReplicas }}
-    targetMemoryUtilization: {{ $collector.hpa.targetMemoryUtilization }}
-    {{- if $collector.hpa.targetCPUUtilization }}
-    targetCPUUtilization: {{ $collector.hpa.targetCPUUtilization }}
+    minReplicas: {{ .minReplicas }}
+    maxReplicas: {{ .maxReplicas }}
+    targetMemoryUtilization: {{ .targetMemoryUtilization }}
+    {{- if .targetCPUUtilization }}
+    targetCPUUtilization: {{ .targetCPUUtilization }}
     {{- end }}
   {{- end }}
+  {{- end }}
   {{- with $collector.podAnnotations }}
   podAnnotations:
     {{- toYaml . | nindent 4}}

charts/kube-otel-stack/values.yaml

@@ -51,6 +51,11 @@ tracesCollector:
   image: otel/opentelemetry-collector-contrib:0.83.0
   mode: deployment
   replicas: 1
+  hpa:
+    enabled: false
+    minReplicas: 3
+    maxReplicas: 10
+    targetMemoryUtilization: 70
   resources:
     limits:
       cpu: 250m

charts/otel-cloud-stack/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.2.4"
+version: "0.2.5"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/otel-cloud-stack/templates/collector.yaml

@@ -27,15 +27,17 @@ spec:
   {{- if not (eq $collector.mode "daemonset") }}
   replicas: {{ $collector.replicas | default 1 }}
   {{- end }}
-  {{- if $collector.hpa }}
+  {{- with $collector.hpa }}
+  {{- if .enabled }}
   autoscaler:
-    minReplicas: {{ $collector.hpa.minReplicas }}
-    maxReplicas: {{ $collector.hpa.maxReplicas }}
-    targetMemoryUtilization: {{ $collector.hpa.targetMemoryUtilization }}
-    {{- if $collector.hpa.targetCPUUtilization }}
-    targetCPUUtilization: {{ $collector.hpa.targetCPUUtilization }}
+    minReplicas: {{ .minReplicas }}
+    maxReplicas: {{ .maxReplicas }}
+    targetMemoryUtilization: {{ .targetMemoryUtilization }}
+    {{- if .targetCPUUtilization }}
+    targetCPUUtilization: {{ .targetCPUUtilization }}
     {{- end }}
   {{- end }}
+  {{- end }}
   {{- with $collector.podAnnotations }}
   podAnnotations:
     {{- toYaml . | nindent 4}}