Merge pull request #35 from aspecto-io/v0.91.0

fix: remove config sources from receiver
aspecto-io · Jan 3, 2024 · 677aedc · 677aedc
2 parents 8127e39 + ebfa589
commit 677aedc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: aspecto-io-opentelemetry-collector
-version: '1.5.5'
+version: '1.5.6'
 home: https://aspecto.io
 type: application
 description: helm chart of aspecto's opentelemetry tail sampling collector

diff --git a/charts/opentelemetry-collector/templates/receiver/configMap.yaml b/charts/opentelemetry-collector/templates/receiver/configMap.yaml
@@ -24,9 +24,6 @@ metadata:
   {{- if $localObjectAnnotations }}{{ toYaml $localObjectAnnotations | nindent 4 }}{{- end }}
 data:
   {{ .Values.receiver.specs.volumes.serviceConfig.fileName }}: |
-    config_sources:
-      aspecto:
-        token: ${token}
     receivers:
       otlp:
         protocols:

diff --git a/charts/opentelemetry-collector/templates/receiver/deployment.yaml b/charts/opentelemetry-collector/templates/receiver/deployment.yaml
@@ -77,19 +77,8 @@ spec:
               mountPath: {{ .mountPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
-
-          env:
-  {{- if or ( $root.Values.global.aspecto.token.secret.createNewSecret) ($root.Values.global.aspecto.token.secret.existingSecretName) }}
-            - name: token
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.aspecto.token.secret.existingSecretName | default (printf "%s-token" .Values.global.name) }}
-                  key: {{ .Values.global.aspecto.token.secret.keyName }}
-  {{ else }}
-            - name: token
-              value: {{ .Values.global.aspecto.token.value }}
-  {{- end }}
 {{- if .Values.receiver.envs }}
+          env:
 {{ toYaml .Values.receiver.envs | indent 10 }}
           {{- end}}
           {{- if .Values.receiver.envFrom }}