From b7e606f922b7ea8d9bfac294ec724b5386d39477 Mon Sep 17 00:00:00 2001 From: "kobi.c" Date: Wed, 3 Jan 2024 09:09:49 +0200 Subject: [PATCH 1/2] fix: remove config sources from receiver --- .../templates/receiver/configMap.yaml | 3 --- .../templates/receiver/deployment.yaml | 13 +------------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/charts/opentelemetry-collector/templates/receiver/configMap.yaml b/charts/opentelemetry-collector/templates/receiver/configMap.yaml index 8c0042a..62bc1d9 100644 --- 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 index 59cc21e..c8e933d 100644 --- 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 }} From ebfa5899716a5415741791fb1cce1e0183b9d2db Mon Sep 17 00:00:00 2001 From: "kobi.c" Date: Wed, 3 Jan 2024 09:10:03 +0200 Subject: [PATCH 2/2] fix: remove config sources from receiver --- charts/opentelemetry-collector/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index 237f68e..2a7589d 100644 --- 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