From 4e5232eca91c186904c377b8d4a7b2398d524311 Mon Sep 17 00:00:00 2001
From: Jeferson Catarina <catarinajeferson@gmail.com>
Date: Mon, 8 Jul 2024 22:12:40 -0300
Subject: [PATCH 1/5] chore: make sure apm access is shown on epinio

---
 chart/apm/apm-0.0.1.tgz                    | Bin 3325 -> 3681 bytes
 chart/apm/templates/apm-access-secret.yaml |  12 ++++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 chart/apm/templates/apm-access-secret.yaml

diff --git a/chart/apm/apm-0.0.1.tgz b/chart/apm/apm-0.0.1.tgz
index daf5937890a2bf8a4d6bb988e62c06d53acdf62a..0b4263557fcd90f779100bd5bad5edf49eaf5669 100644
GIT binary patch
delta 3657
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
bE4(YavMal?zWiSR00960DDP200AK(B;weC{

delta 3298
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

diff --git a/chart/apm/templates/apm-access-secret.yaml b/chart/apm/templates/apm-access-secret.yaml
new file mode 100644
index 00000000..a76354fd
--- /dev/null
+++ b/chart/apm/templates/apm-access-secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ include "apm.fullname" . }}-oauth2"
+  labels:
+    {{- include "apm.labels" . | 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 }}

From 4db7cf50382d1e228043ccacc147c49ef6625e51 Mon Sep 17 00:00:00 2001
From: Jeferson Catarina <catarinajeferson@gmail.com>
Date: Tue, 9 Jul 2024 12:15:41 -0300
Subject: [PATCH 2/5] chore: separate common labels from epinio labels

---
 chart/apm/apm-0.0.1.tgz                       | Bin 3681 -> 3709 bytes
 chart/apm/templates/_helpers.tpl              |   6 ++++++
 chart/apm/templates/apm-access-secret.yaml    |   3 ++-
 chart/apm/templates/jaeger-ingress.yaml       |   1 +
 chart/apm/templates/jaeger-instance.yaml      |   1 +
 chart/apm/templates/jaeger-pvc.yaml           |   1 +
 chart/apm/templates/oauth2-deployment.yaml    |   1 +
 chart/apm/templates/oauth2-service.yaml       |   1 +
 chart/apm/templates/otel-collector.yaml       |   1 +
 chart/apm/templates/otel-instrumentation.yaml |   1 +
 10 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/chart/apm/apm-0.0.1.tgz b/chart/apm/apm-0.0.1.tgz
index 0b4263557fcd90f779100bd5bad5edf49eaf5669..f05d1725573f2c2d3854a9b4d42fa48efe8cc3c0 100644
GIT binary patch
delta 3685
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
D90O*z

delta 3657
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
bE4(YavMal?zWiSR00960DDP200AK(B4G=)G

diff --git a/chart/apm/templates/_helpers.tpl b/chart/apm/templates/_helpers.tpl
index ce10ab8c..55db20a5 100644
--- 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
index a76354fd..e1c0679c 100644
--- a/chart/apm/templates/apm-access-secret.yaml
+++ b/chart/apm/templates/apm-access-secret.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "{{ include "apm.fullname" . }}-oauth2"
+  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 }}
diff --git a/chart/apm/templates/jaeger-ingress.yaml b/chart/apm/templates/jaeger-ingress.yaml
index aafa48d7..c50d69fa 100644
--- 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
index e441e254..8b2af7f4 100644
--- 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
index 14bad070..afede447 100644
--- 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
index fbf353f3..2e933739 100644
--- 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 }}
diff --git a/chart/apm/templates/oauth2-service.yaml b/chart/apm/templates/oauth2-service.yaml
index f6f6f3a0..d7e7c0b6 100644
--- 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
index b823b105..54fd9ae0 100644
--- 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
index 2aac3bc4..b628eba7 100644
--- 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 }}

From 038d0084c1d91a29e4ff1ff9489cb81797c00f84 Mon Sep 17 00:00:00 2001
From: Jeferson Catarina <catarinajeferson@gmail.com>
Date: Tue, 9 Jul 2024 12:24:27 -0300
Subject: [PATCH 3/5] chore: manually disable epinio config

---
 chart/apm/apm-0.0.1.tgz                 | Bin 3709 -> 3722 bytes
 chart/apm/templates/oauth2-secrets.yaml |   3 +++
 2 files changed, 3 insertions(+)

diff --git a/chart/apm/apm-0.0.1.tgz b/chart/apm/apm-0.0.1.tgz
index f05d1725573f2c2d3854a9b4d42fa48efe8cc3c0..8eefd042fc3790908565d4f6b692a67733e1ad81 100644
GIT binary patch
delta 3697
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
P00960D92PU0Ac_DZU%ab

delta 3684
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
CZ)PO`

diff --git a/chart/apm/templates/oauth2-secrets.yaml b/chart/apm/templates/oauth2-secrets.yaml
index 842a1e75..bf893d01 100644
--- a/chart/apm/templates/oauth2-secrets.yaml
+++ b/chart/apm/templates/oauth2-secrets.yaml
@@ -8,6 +8,9 @@ metadata:
     {{- toYaml .Values.commonLabels | nindent 4 }}
     {{- end }}
     app.kubernetes.io/oauth2-proxy: "true"
+    epinio.io/configuration: "false"
+    epinio.io/configuration-origin: "none"
+
 data:
   OAUTH2_PROXY_CLIENT_ID: "{{ .Values.keycloak.clientId | b64enc }}"
   OAUTH2_PROXY_CLIENT_SECRET: "{{ .Values.keycloak.clientSecret | b64enc }}"

From a42169779d0ecce2b23d08152c4e7211eba2fb13 Mon Sep 17 00:00:00 2001
From: Jeferson Catarina <catarinajeferson@gmail.com>
Date: Tue, 9 Jul 2024 12:39:43 -0300
Subject: [PATCH 4/5] chore: get rid of the secret

---
 chart/apm/apm-0.0.1.tgz                    | Bin 3722 -> 3666 bytes
 chart/apm/templates/oauth2-deployment.yaml |  10 +++++++---
 chart/apm/templates/oauth2-secrets.yaml    |  17 -----------------
 3 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 chart/apm/templates/oauth2-secrets.yaml

diff --git a/chart/apm/apm-0.0.1.tgz b/chart/apm/apm-0.0.1.tgz
index 8eefd042fc3790908565d4f6b692a67733e1ad81..8f6887a1ce2ab3852174d9d509f373d59196db40 100644
GIT binary patch
delta 3642
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
M|2XZQCIDOj03$j|TmS$7

delta 3698
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
Q2LJ&7|0u^)F92cy09NLDoB#j-

diff --git a/chart/apm/templates/oauth2-deployment.yaml b/chart/apm/templates/oauth2-deployment.yaml
index 2e933739..5e17ea16 100644
--- a/chart/apm/templates/oauth2-deployment.yaml
+++ b/chart/apm/templates/oauth2-deployment.yaml
@@ -36,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
deleted file mode 100644
index bf893d01..00000000
--- a/chart/apm/templates/oauth2-secrets.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: "{{ include "apm.fullname" . }}-oauth2"
-  labels:
-    {{- include "apm.labels" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- toYaml .Values.commonLabels | nindent 4 }}
-    {{- end }}
-    app.kubernetes.io/oauth2-proxy: "true"
-    epinio.io/configuration: "false"
-    epinio.io/configuration-origin: "none"
-
-data:
-  OAUTH2_PROXY_CLIENT_ID: "{{ .Values.keycloak.clientId | b64enc }}"
-  OAUTH2_PROXY_CLIENT_SECRET: "{{ .Values.keycloak.clientSecret | b64enc }}"
-  OAUTH2_PROXY_COOKIE_SECRET: "{{ .Values.keycloak.cookieSecret | b64enc }}"

From c01ead3b24ad11252f67f9975ba94b6c969b8984 Mon Sep 17 00:00:00 2001
From: Jeferson Catarina <catarinajeferson@gmail.com>
Date: Tue, 9 Jul 2024 14:11:46 -0300
Subject: [PATCH 5/5] chore: enable or disable apm autoinstrumenting

---
 chart/application/Chart.yaml                    |   2 +-
 chart/application/custom-application-0.0.35.tgz | Bin 0 -> 5185 bytes
 chart/application/templates/deployment.yaml     |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 chart/application/custom-application-0.0.35.tgz

diff --git a/chart/application/Chart.yaml b/chart/application/Chart.yaml
index e996cc69..c327fd34 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..95459a9e8c69552f009ae1c544dea8642034d444
GIT binary patch
literal 5185
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

literal 0
HcmV?d00001

diff --git a/chart/application/templates/deployment.yaml b/chart/application/templates/deployment.yaml
index 80cde791..aa243d30 100644
--- 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: