CR

Author: yairsappir

wiz-outpost-lite/templates/_helpers.tpl

@@ -102,13 +102,6 @@ container-registry -> outpost-lite-runner-container-registry
 {{- $values = merge $values $.Values.openshiftOverrides }}
 {{- end }}
 
-{{/* Add apparmor pod annotation if given */}}
-{{- if ne $values.apparmorProfile "" }}
-{{- $appArmorKey := printf "container.apparmor.security.beta.kubernetes.io/%s-%s" $.Chart.Name $runner }}
-{{- $appArmorDict := dict $appArmorKey $values.apparmorProfile }}
-{{- $values = merge $values (dict "podAnnotationsApparmor" $appArmorDict) }}
-{{- end }}
-
 {{- if hasKey $values "containerSecurityContextOverride"}}
 {{- $values = set $values "containerSecurityContext" $values.containerSecurityContextOverride }}
 {{- end }}

wiz-outpost-lite/templates/deployment.yaml

@@ -18,8 +18,8 @@ spec:
         {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.podAnnotationsApparmor }}
-        {{- toYaml . | nindent 8 }}
+        {{- if ne .Values.apparmorProfile "" }}
+        container.apparmor.security.beta.kubernetes.io/{{ printf "%s-%s" .Chart.Name .runner }}: {{ .Values.apparmorProfile }}
         {{- end }}
       labels:
         {{- include "wiz-outpost-lite.selectorLabels" . | nindent 8 }}