Merge branch 'micah.nagel-master-patch-80342' into 'master'

Neuvector duplicate manager block fix

See merge request !2605

chart/templates/neuvector/values.yaml

@@ -85,9 +85,6 @@ monitor:
 enforcer:
   podAnnotations:
     {{ include "istioAnnotation" . }}
-manager:
-  podAnnotations:
-    {{ include "istioAnnotation" . }}
 cve:
   updater:
     podAnnotations:
@@ -101,6 +98,10 @@ cve:
 manager:
   env:
     ssl: false
+  {{- if $istioInjection }}
+  podAnnotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
 {{- end }}
 
 networkPolicies: