From e9bf2665e39aa90c5ef810f09b3cb961521fb08e Mon Sep 17 00:00:00 2001
From: Adrian Berger <adrian.berger@bedag.ch>
Date: Mon, 7 Oct 2024 13:45:15 +0200
Subject: [PATCH] fix: Remove subPath from configMap file mount in vcluster

Signed-off-by: Adrian Berger <adrian.berger@bedag.ch>
---
 .../components/kubernetes/apiserver/deployment.yaml          | 5 ++---
 .../templates/components/kubernetes/apiserver/policy.yaml    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/charts/vcluster/templates/components/kubernetes/apiserver/deployment.yaml b/charts/vcluster/templates/components/kubernetes/apiserver/deployment.yaml
index 59ddec7b..82613e80 100644
--- a/charts/vcluster/templates/components/kubernetes/apiserver/deployment.yaml
+++ b/charts/vcluster/templates/components/kubernetes/apiserver/deployment.yaml
@@ -112,7 +112,7 @@ spec:
           {{- end }}
         {{- end }}
         {{- if $kubernetes.apiServer.audit.enabled }}
-        - --audit-policy-file=/etc/kubernetes/audit-policy.yaml
+        - --audit-policy-file=/etc/kubernetes/audit/policy.yaml
         - --audit-log-path=/var/log/kubernetes/audit/audit.log
         - --audit-log-maxage={{ $kubernetes.apiServer.audit.maxAge | int }}
         - --audit-log-maxbackup={{ $kubernetes.apiServer.audit.maxBackup | int }}
@@ -184,10 +184,9 @@ spec:
           {{- end }}
         {{- end }}
         {{- if $kubernetes.apiServer.audit.enabled }}
-        - mountPath: /etc/kubernetes/audit-policy.yaml
+        - mountPath: /etc/kubernetes/audit/
           name: audit
           readOnly: true
-          subPath: audit-policy.yaml
         - mountPath: /var/log/kubernetes/audit/
           name: audit-log
           readOnly: false
diff --git a/charts/vcluster/templates/components/kubernetes/apiserver/policy.yaml b/charts/vcluster/templates/components/kubernetes/apiserver/policy.yaml
index 8a1caebb..4e8f36c8 100644
--- a/charts/vcluster/templates/components/kubernetes/apiserver/policy.yaml
+++ b/charts/vcluster/templates/components/kubernetes/apiserver/policy.yaml
@@ -12,7 +12,7 @@ metadata:
     {{ include "pkg.common.labels.component" $ }}: {{ $component_name }}
   namespace: {{ $.Release.Namespace }}
 data:
-  audit-policy.yaml: |
+  policy.yaml: |
     {{- $kubernetes.apiServer.audit.policy | nindent 4 }}
   {{- end -}}
 {{- end -}}