Merge branch 'finalize-tempo-first-tag' into 'master'

Finalize tempo first tag

Closes platform-one/big-bang/apps/sandbox/tempo#1

See merge request platform-one/big-bang/bigbang!1253

chart/templates/istio/controlplane/values.yaml

@@ -7,8 +7,25 @@
 {{- $domainName := default .Values.domain .Values.hostname }}
 domain: {{ $domainName }}
 
+{{- if or .Values.jaeger.enabled .Values.tempo.enabled }}
 tracing:
-  enabled:  {{ .Values.jaeger.enabled }}
+{{- if .Values.jaeger.enabled }}
+  enabled: {{ .Values.jaeger.enabled }}
+{{- end }}
+{{- if .Values.tempo.enabled }}
+  enabled:  {{ .Values.tempo.enabled }}
+  zipkin:
+    address: 'otel-collector.tempo.svc:9411'
+  sampling: 100
+  max_path_tag_length: 99999
+{{- end }}
+{{- end }}
+
+{{- if .Values.tempo.enabled }}
+meshConfig:
+  accessLogFormat: |
+    [%START_TIME%] "%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%" %RESPONSE_CODE% %RESPONSE_FLAGS% %RESPONSE_CODE_DETAILS% %CONNECTION_TERMINATION_DETAILS% "%UPSTREAM_TRANSPORT_FAILURE_REASON%" %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% "%REQ(X-FORWARDED-FOR)%" "%REQ(USER-AGENT)%" "%REQ(X-REQUEST-ID)%" "%REQ(:AUTHORITY)%" "%UPSTREAM_HOST%" %UPSTREAM_CLUSTER% %UPSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_LOCAL_ADDRESS% %DOWNSTREAM_REMOTE_ADDRESS% %REQUESTED_SERVER_NAME% %ROUTE_NAME% traceID=%REQ(x-b3-traceid)%
+{{- end }}
 
 imagePullSecrets:
   - private-registry
@@ -36,7 +53,7 @@ ingressGateways:
 {{- range $name, $values := .Values.istio.ingressGateways }}
   {{ $name | nindent 2 }}:
     {{- toYaml (merge (dict "k8s" $values.kubernetesResourceSpec) (fromYaml (include "istio.ingressgateway.k8s" $values))) | nindent 4 }}
-    {{- if $values.extraLabels }} 
+    {{- if $values.extraLabels }}
     {{- toYaml (dict "extraLabels" $values.extraLabels) | nindent 4 }}
     {{- end}}
 {{- end }}
@@ -62,9 +79,9 @@ gateways:
         credentialName: {{ $name }}-cert
         mode: {{ dig "tls" "mode" "SIMPLE" $values }}
         {{- end }}
-      {{ else }} 
+      {{ else }}
     - hosts:
-      {{- tpl ($values.hosts | default (list) | toYaml) $ | nindent 8 }} 
+      {{- tpl ($values.hosts | default (list) | toYaml) $ | nindent 8 }}
       port:
         name: https
         number: 8443
@@ -72,7 +89,7 @@ gateways:
       tls:
         credentialName: {{ $name }}-cert
         mode: {{ dig "tls" "mode" "SIMPLE" $values }}
-      {{- end }}  
+      {{- end }}
 {{- end }}
 {{- end }}
 

chart/templates/monitoring/values.yaml

@@ -23,7 +23,7 @@ networkPolicies:
 
 minioOperator:
   enabled: {{ .Values.addons.minioOperator.enabled }}
-  
+
 gitlabRunner:
   enabled: {{ .Values.addons.gitlabRunner.enabled }}
 
@@ -128,13 +128,34 @@ grafana:
     {{ include "istioAnnotation" . }}
   {{- end }}
 
-  {{- if .Values.loki.enabled }}
+  {{- if or .Values.loki.enabled .Values.tempo.enabled }}
   additionalDataSources:
+  {{- if .Values.loki.enabled }}
   - name: Loki
     type: loki
     url: http://logging-loki.logging.svc.cluster.local:3100
     access: proxy
   {{- end }}
+  {{- if and .Values.loki.enabled .Values.tempo.enabled }}
+    jsonData:
+      derivedFields:
+        - datasourceName: Tempo
+          matcherRegex: "traceID=(\\w+)"
+          name: TraceID
+          url: "$${__value.raw}"
+          datasourceUid: tempo
+  {{- end }}
+  {{- if .Values.tempo.enabled }}
+  - name: Tempo
+    type: tempo
+    access: proxy
+    orgId: 1
+    uid: tempo
+    url: http://tempo-tempo.tempo.svc:3100
+    isDefault: false
+    editable: true
+  {{- end }}
+  {{- end }}
 
   grafana.ini:
     {{- if .Values.istio.enabled }}
@@ -162,13 +183,13 @@ grafana:
       {{- list "tls_client_cert" .tls_client_cert | include "bigbang.addValueIfSet" | indent 6 }}
       {{- list "tls_client_key" .tls_client_key | include "bigbang.addValueIfSet" | indent 6 }}
     {{- end }}
-    
+
   {{- if or .Values.loki.enabled .Values.addons.gitlabRunner.enabled }}
   plugins:
-  {{- if .Values.loki.enabled }}  
+  {{- if .Values.loki.enabled }}
     - grafana-piechart-panel
   {{- end }}
-  {{- if .Values.addons.gitlabRunner.enabled }}  
+  {{- if .Values.addons.gitlabRunner.enabled }}
     - grafana-polystat-panel
   {{- end }}
   {{- end }}
@@ -202,15 +223,15 @@ kube-state-metrics:
     {{ include "istioAnnotation" . }}
   {{- end }}
 
-prometheusOperator:      
+prometheusOperator:
   image:
-    pullPolicy: {{ .Values.imagePullPolicy }}      
-  admissionWebhooks:        
-    cleanupProxy:          
-      image:            
-        pullPolicy: {{ .Values.imagePullPolicy }}        
-    patch:           
-      image:            
+    pullPolicy: {{ .Values.imagePullPolicy }}
+  admissionWebhooks:
+    cleanupProxy:
+      image:
+        pullPolicy: {{ .Values.imagePullPolicy }}
+    patch:
+      image:
         pullPolicy: {{ .Values.imagePullPolicy }}
 
   {{- if $istioInjection }}

chart/templates/tempo/gitrepository.yaml

+{{- if and (not .Values.offline)  .Values.tempo.enabled }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: tempo
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: tempo
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
+spec:
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.tempo.git.repo }}
+  ref:
+    {{- include "validRef" .Values.tempo.git | nindent 4 }}
+  {{ include "gitIgnore" . }}
+  {{- include "gitCreds" . | nindent 2 }}
+{{- end }}

chart/templates/tempo/imagepullsecret.yaml

+{{- if .Values.tempo.enabled }}
+{{- if ( include "imagePullSecret" . ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: private-registry
+  namespace: tempo
+  labels:
+    app.kubernetes.io/name: tempo
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+{{- end }}

chart/templates/tempo/namespace.yaml

+{{- if .Values.tempo.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: tempo
+  labels:
+    app.kubernetes.io/name: tempo
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
+    istio-injection: enabled
+{{- end }}

chart/templates/tempo/tempo-helmrelease.yaml

+{{- $fluxSettingsTempo := merge .Values.tempo.flux .Values.flux -}}
+{{- if .Values.tempo.enabled }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: tempo
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: tempo
+    app.kubernetes.io/component: "core"
+    {{- include "commonLabels" . | nindent 4}}
+spec:
+  targetNamespace: tempo
+  chart:
+    spec:
+      chart: {{ .Values.tempo.git.path }}
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: tempo
+        namespace: {{ .Release.Namespace }}
+
+  {{- toYaml $fluxSettingsTempo | nindent 2 }}
+
+  {{- if .Values.tempo.postRenderers }}
+  postRenderers:
+  {{ toYaml .Values.tempo.postRenderers | nindent 4 }}
+  {{- end }}
+  valuesFrom:
+    - name: {{ .Release.Name }}-tempo-values
+      kind: Secret
+      valuesKey: "common"
+    - name: {{ .Release.Name }}-tempo-values
+      kind: Secret
+      valuesKey: "defaults"
+    - name: {{ .Release.Name }}-tempo-values
+      kind: Secret
+      valuesKey: "overlays"
+  {{- if or .Values.monitoring.enabled .Values.istio.enabled }}
+  dependsOn:
+    {{- if  .Values.monitoring.enabled }}
+    - name: monitoring
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+
+    {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
+    {{- end }}
+  {{- end }}
+{{- end }}

chart/templates/tempo/values.yaml

+{{- if .Values.tempo.enabled }}
+{{- include "values-secret" (dict "root" $ "package" .Values.tempo "name" "tempo" "defaults" (include "bigbang.defaults.tempo" .)) }}
+{{- end }}
+
+{{- define "bigbang.defaults.tempo" -}}
+
+tempo:
+  imagePullSecrets:
+  - name: private-registry
+
+opentelemetryCollector:
+  enabled: {{ .Values.istio.enabled }}
+  imagePullSecrets:
+  - name: private-registry
+
+tempo:
+  pullPolicy: {{ .Values.imagePullPolicy }}
+
+tempoQuery:
+  pullPolicy: {{ .Values.imagePullPolicy }}
+
+networkPolicies:
+  enabled: {{ .Values.networkPolicies.enabled }}
+
+istio:
+  enabled: {{ .Values.istio.enabled }}
+
+monitoring:
+  enabled: {{ .Values.monitoring.enabled }}
+
+serviceMonitor:
+  enabled: {{ .Values.monitoring.enabled }}
+
+{{- end -}}

chart/values.yaml

@@ -462,6 +462,27 @@ loki:
 # ----------------------------------------------------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------------------------------------------------
+
+tempo:
+  # -- Toggle deployment of Tempo.
+  enabled: false
+  git:
+    repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
+    path: "./chart"
+    tag: "0.12.2-bb.0"
+
+  # -- Flux reconciliation overrides specifically for the Tempo Package
+  flux: {}
+
+  # -- Values to passthrough to the Tempo chart: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/tempo.git
+  values: {}
+
+  # -- Post Renderers.  See docs/postrenders.md
+  postRenderers: []
+# ----------------------------------------------------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------------------------------------------------
+
 # Monitoring
 #
 monitoring: