Skip to content

Commit ff55ebc

Browse files
committed
feat: remove some otel attributes
1 parent 4749653 commit ff55ebc

File tree

3 files changed

+0
-28
lines changed

3 files changed

+0
-28
lines changed

charts/gitops-runtime/templates/_components/internal-router/_deployment.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ spec:
3434
securityContext:
3535
{{- toYaml .Values.securityContext | nindent 12 }}
3636
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
37-
{{- $accountId := .Values.global.codefresh.accountId -}}
38-
{{- $runtimeName := .Values.global.runtime.name -}}
39-
{{- $otelResourceAttributes := printf "service.name=app-proxy,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
40-
{{- $_ := set .Values.env "OTEL_RESOURCE_ATTRIBUTES" $otelResourceAttributes }}
41-
{{- $_ := set .Values.env "A_RUNTIME_TOKEN" (dict "valueFrom" (dict "secretKeyRef" (dict "name" "codefresh-token" "key" "token" "optional" true ))) }}
42-
{{- $_ := set .Values.env "OTEL_EXPORTER_OTLP_HEADERS" "Authorization=$(A_RUNTIME_TOKEN)" }}
4337
{{- include "codefresh-gitops-runtime.components.common_helpers.container-templates.env-vars" .Values.env | nindent 10 }}
4438
imagePullPolicy: {{ .Values.image.pullPolicy }}
4539
ports:

charts/gitops-runtime/templates/hooks/pre-install/_env.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ NAMESPACE:
2323
fieldRef:
2424
fieldPath: metadata.namespace
2525
REQUIRED_VERSION_CONSTRAINT: ">=2.12 <3.1"
26-
{{- $accountId := .Values.global.codefresh.accountId -}}
27-
{{- $runtimeName := .Values.global.runtime.name -}}
28-
{{- $otelResourceAttributes := printf "service.name=pre-install,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
29-
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
30-
A_RUNTIME_TOKEN:
31-
valueFrom:
32-
secretKeyRef:
33-
name: codefresh-token
34-
key: token
35-
optional: true
36-
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_RUNTIME_TOKEN)"
3726
{{- end -}}
3827

3928
{{- define "installer.validate-values.environment-variables" -}}

charts/gitops-runtime/templates/hooks/pre-uninstall/_env.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@ SSL_CERT_FILE: /app/config/codefresh-tls-certs/{{ $customCASecretKey }}
1515
{{- end }}
1616
USER_TOKEN:
1717
{{- include "codefresh-gitops-runtime.installation-token-env-var-value" . | nindent 2 }}
18-
{{- $accountId := .Values.global.codefresh.accountId -}}
19-
{{- $runtimeName := .Values.global.runtime.name -}}
20-
{{- $otelResourceAttributes := printf "service.name=pre-uninstall,cf.account.id=%s,cf.gitops.runtime.name=%s" $accountId $runtimeName -}}
21-
OTEL_RESOURCE_ATTRIBUTES: {{ $otelResourceAttributes }}
22-
A_RUNTIME_TOKEN:
23-
valueFrom:
24-
secretKeyRef:
25-
name: codefresh-token
26-
key: token
27-
optional: true
28-
OTEL_EXPORTER_OTLP_HEADERS: "Authorization=$(A_RUNTIME_TOKEN)"
2918
{{- end -}}
3019

3120
{{- define "installer.delete-runtime-from-platform.environment-variables" -}}

0 commit comments

Comments
 (0)