feat: remove entity_key (#314)

observeinc · Feb 4, 2025 · 57cffca · 57cffca
1 parent 7de62d2
commit 57cffca
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: agent
 description: Chart to install K8s collection stack based on Observe Agent
 type: application
-version: 0.39.0
+version: 0.40.0
 appVersion: "1.1.0"
 dependencies:
   - name: opentelemetry-collector

diff --git a/charts/agent/README.md b/charts/agent/README.md
@@ -1,6 +1,6 @@
 # agent
 
-![Version: 0.39.0](https://img.shields.io/badge/Version-0.39.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
+![Version: 0.40.0](https://img.shields.io/badge/Version-0.40.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
 
 > [!CAUTION]
 > This chart is under active development and is not meant to be installed yet.
@@ -76,10 +76,6 @@ Chart to install K8s collection stack based on Observe Agent
 | cluster-events.extraEnvs[2].valueFrom.secretKeyRef.key | string | `"OBSERVE_TOKEN"` |  |
 | cluster-events.extraEnvs[2].valueFrom.secretKeyRef.name | string | `"agent-credentials"` |  |
 | cluster-events.extraEnvs[2].valueFrom.secretKeyRef.optional | bool | `true` |  |
-| cluster-events.extraEnvs[3].name | string | `"ENTITY_TOKEN"` |  |
-| cluster-events.extraEnvs[3].valueFrom.secretKeyRef.key | string | `"ENTITY_TOKEN"` |  |
-| cluster-events.extraEnvs[3].valueFrom.secretKeyRef.name | string | `"agent-credentials"` |  |
-| cluster-events.extraEnvs[3].valueFrom.secretKeyRef.optional | bool | `true` |  |
 | cluster-events.extraVolumeMounts[0].mountPath | string | `"/observe-agent-conf"` |  |
 | cluster-events.extraVolumeMounts[0].name | string | `"observe-agent-deployment-config"` |  |
 | cluster-events.extraVolumes[0].configMap.defaultMode | int | `420` |  |

diff --git a/charts/agent/templates/_config-exporters.tpl b/charts/agent/templates/_config-exporters.tpl
@@ -17,11 +17,7 @@ otlphttp/observe/base:
 otlphttp/observe/entity:
     logs_endpoint: "{{ .Values.observe.collectionEndpoint.value | toString | trimSuffix "/" }}/v1/kubernetes/v1/entity"
     headers:
-    {{- if .Values.observe.entityToken.use }}
-        authorization: "Bearer ${env:ENTITY_TOKEN}"
-    {{- else }}
-        authorization: "${env:OBSERVE_TOKEN}"
-    {{- end }}
+      authorization: "${env:OBSERVE_TOKEN}"
     sending_queue:
       enabled: {{ .Values.agent.config.global.exporters.sendingQueue.enabled }}
     retry_on_failure:

diff --git a/charts/agent/templates/secret.yaml b/charts/agent/templates/secret.yaml
@@ -8,9 +8,6 @@ data:
   {{- if .Values.observe.token.create }}
   OBSERVE_TOKEN: {{ .Values.observe.token.value | b64enc | quote }}
   {{- end}}
-  {{- if .Values.observe.entityToken.create }}
-  ENTITY_TOKEN: {{ .Values.observe.entityToken.value | b64enc | quote }}
-  {{- end}}
   {{- if .Values.observe.traceToken.create }}
   TRACE_TOKEN: {{ .Values.observe.traceToken.value | b64enc | quote }}
   {{- end}}

diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
@@ -268,12 +268,6 @@ cluster-events:
           name: agent-credentials
           key: OBSERVE_TOKEN
           optional: true
-    - name: ENTITY_TOKEN
-      valueFrom:
-        secretKeyRef:
-          name: agent-credentials
-          key: ENTITY_TOKEN
-          optional: true
   extraEnvsFrom: []
   extraVolumes:
     - name: "observe-agent-deployment-config"