Merge pull request #2 from JeferCatarina/chore/apm-app-chart-2

Chore/apm app chart 2
vmfarms · Jul 9, 2024 · 06be873 · 06be873
2 parents 9db6895 + c01ead3
commit 06be873
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 19 deletions.
diff --git a/chart/apm/apm-0.0.1.tgz b/chart/apm/apm-0.0.1.tgz
diff --git a/chart/apm/templates/_helpers.tpl b/chart/apm/templates/_helpers.tpl
@@ -40,6 +40,12 @@ helm.sh/chart: {{ include "apm.chart" . }}
 app.kubernetes.io/name: {{ .Chart.Name }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Epinio labels
+*/}}
+{{- define "apm.epinioLabels" -}}
 {{- if .Values.epinio }}
 epinio.io/configuration: "true"
 epinio.io/configuration-origin: {{ .Values.epinio.serviceName }}

diff --git a/chart/apm/templates/apm-access-secret.yaml b/chart/apm/templates/apm-access-secret.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ include "apm.fullname" . }}-apm-access"
+  labels:
+    {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- toYaml .Values.commonLabels | nindent 4 }}
+    {{- end }}
+data:
+  APM_UI: {{ printf "https://%s-jaeger.%s.%s" (include "apm.fullname" .) .Release.Namespace .Values.ingress.domain  | b64enc }}
+  APM_SERVER: {{  printf "http://%s-otel-collector:4318" (include "apm.fullname" .) | b64enc }}
diff --git a/chart/apm/templates/jaeger-ingress.yaml b/chart/apm/templates/jaeger-ingress.yaml
@@ -32,6 +32,7 @@ metadata:
   name: "{{ include "apm.fullname" . }}-oauth2"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/apm/templates/jaeger-instance.yaml b/chart/apm/templates/jaeger-instance.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "{{ include "apm.fullname" . }}-jaeger"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/apm/templates/jaeger-pvc.yaml b/chart/apm/templates/jaeger-pvc.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "data-{{ include "apm.fullname" . }}-jaeger"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/apm/templates/oauth2-deployment.yaml b/chart/apm/templates/oauth2-deployment.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "{{ include "apm.fullname" . }}-oauth2"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}
@@ -35,9 +36,13 @@ spec:
         - --allowed-group="/{{ .Release.Namespace }}"
         - --code-challenge-method=S256
         - --http-address=0.0.0.0:4180
-        envFrom:
-        - secretRef:
-            name: "{{ include "apm.fullname" . }}-oauth2"
+        env:
+        - name: OAUTH2_PROXY_CLIENT_ID 
+          value: "{{ .Values.keycloak.clientId }}"
+        - name: OAUTH2_PROXY_CLIENT_SECRET 
+          value: "{{ .Values.keycloak.clientSecret }}"
+        - name: OAUTH2_PROXY_COOKIE_SECRET 
+          value: "{{ .Values.keycloak.cookieSecret }}"
         image: quay.io/oauth2-proxy/oauth2-proxy:latest
         imagePullPolicy: Always
         name: oauth2-proxy

diff --git a/chart/apm/templates/oauth2-secrets.yaml b/chart/apm/templates/oauth2-secrets.yaml
diff --git a/chart/apm/templates/oauth2-service.yaml b/chart/apm/templates/oauth2-service.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "{{ include "apm.fullname" . }}-oauth2"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/apm/templates/otel-collector.yaml b/chart/apm/templates/otel-collector.yaml
@@ -4,6 +4,7 @@ metadata:
   name: "{{ include "apm.fullname" . }}-otel"
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/apm/templates/otel-instrumentation.yaml b/chart/apm/templates/otel-instrumentation.yaml
@@ -12,6 +12,7 @@ metadata:
   name: auto-instrumentation
   labels:
     {{- include "apm.labels" . | nindent 4 }}
+    {{- include "apm.epinioLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}

diff --git a/chart/application/Chart.yaml b/chart/application/Chart.yaml
@@ -4,7 +4,7 @@ description: The helm chart for epinio applications to be deployed by
 icon: https://raw.githubusercontent.com/epinio/helm-charts/main/assets/epinio.png
 home: https://github.com/epinio/epinio
 type: application
-version: 0.0.34
+version: 0.0.35
 keywords:
 - epinio
 - paas
diff --git a/chart/application/custom-application-0.0.35.tgz b/chart/application/custom-application-0.0.35.tgz
diff --git a/chart/application/templates/deployment.yaml b/chart/application/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
         {{- with .Values.epinio.start }}
         epinio.io/start: {{ . | quote }}
         {{- end }}
-        {{- if .Values.userConfig.apmAutoinstrument }}
+        {{- if and .Values.userConfig.apmAutoinstrument .Values.userConfig.apmAutoinstrumentEnabled }}
         instrumentation.opentelemetry.io/inject-{{ .Values.userConfig.apmAutoinstrument }}: "true"
         {{- end }}
       labels: