From 6c249bb8e5ee293a7f877ab76c6ae398f4f3b7bd Mon Sep 17 00:00:00 2001
From: jdftapi <50618988+jdftapi@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:37:36 +0100
Subject: [PATCH] remove duplicate metadata.annotation key from psp template in
 helm chart (#6678)

* chore: version bump 5.0.6

* fix: merge duplicate metadata.annotation keys in psp template
---
 aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml         | 2 +-
 aio/deploy/helm-chart/kubernetes-dashboard/templates/psp.yaml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml
index eee7a6171d40..e05f1cf16be6 100644
--- a/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml
+++ b/aio/deploy/helm-chart/kubernetes-dashboard/Chart.yaml
@@ -14,7 +14,7 @@
 
 apiVersion: v2
 name: kubernetes-dashboard
-version: 5.0.5
+version: 5.0.6
 appVersion: 2.4.0
 description: General-purpose web UI for Kubernetes clusters
 keywords:
diff --git a/aio/deploy/helm-chart/kubernetes-dashboard/templates/psp.yaml b/aio/deploy/helm-chart/kubernetes-dashboard/templates/psp.yaml
index fa86e1d24d59..bd605c2c9a1b 100644
--- a/aio/deploy/helm-chart/kubernetes-dashboard/templates/psp.yaml
+++ b/aio/deploy/helm-chart/kubernetes-dashboard/templates/psp.yaml
@@ -23,11 +23,10 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
   annotations:
+    seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
-  annotations:
-    seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*'
 spec:
   privileged: false
   fsGroup: