unified helm chart, when linkerd disabled allow setting individual an…

…notations
frontegg · Sep 24, 2024 · ff2eda1 · ff2eda1
1 parent a3d05e5
commit ff2eda1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/common/unified-chart/Chart.yaml b/common/unified-chart/Chart.yaml
@@ -3,7 +3,7 @@ name: unified-chart
 description: Frontegg Unified Chart
 type: application
 
-version: 4.0.30
+version: 4.0.31
 
 maintainers:
   - name: "platform"

diff --git a/common/unified-chart/templates/_helpers.tpl b/common/unified-chart/templates/_helpers.tpl
@@ -140,13 +140,7 @@ app.frontegg.com/name: {{ include "name" . }}-hp
 {{- if .linkerd.enabled }}
 {{- mergeOverwrite .podAnnotations .linkerd.annotations | toYaml }}
 {{- else }}
-{{- if .podAnnotations }}
-{{- $result := .podAnnotations }}
-{{- range $k := keys .linkerd.annotations -}}
-{{- $_ := unset $result $k }}
-{{- end -}}
-{{- toYaml $result }}
-{{- end }}
+{{- toYaml .podAnnotations }}
 {{- end }}
 {{- end -}}