Even more super awesome fixes

Author: ofirc-wiz

wiz-admission-controller/templates/_helpers.tpl

@@ -42,12 +42,12 @@ If release name contains chart name it will be used as a full name.
 
 {{- define "wiz-hpa-enforcer.name" -}}
 {{- $name := printf "%s-hpa" (include "wiz-admission-controller.fullname" .) }}
-{{- default $name .Values.hpa.enforcerNameOverride | trunc 63 | trimSuffix "-" }}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "wiz-hpa-audit-logs.name" -}}
-{{- $name := "wiz-hpa-audit-logs" }}
-{{- default $name .Values.hpa.auditLogsNameOverride | trunc 63 | trimSuffix "-" }}
+{{- $name := printf "%s-hpa" (include "wiz-kubernetes-audit-log-collector.name" .) }}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*

wiz-admission-controller/templates/hpa.yaml

@@ -32,8 +32,8 @@ spec:
           type: Utilization
           averageUtilization: {{ .Values.hpa.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if hasKey .Values.hpa "customMetrics" }}
-    {{- toYaml .Values.hpa.customMetrics | nindent 4 }}
+    {{- with .Values.hpa.customMetrics }}
+      {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- if hasKey .Values.hpa "behavior" }}
   behavior:
@@ -73,8 +73,8 @@ spec:
           type: Utilization
           averageUtilization: {{ .Values.hpa.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if hasKey .Values.hpa "customMetrics" }}
-    {{- toYaml .Values.hpa.customMetrics | nindent 4 }}
+    {{- with .Values.hpa.customMetrics }}
+      {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- if hasKey .Values.hpa "behavior" }}
   behavior:

wiz-admission-controller/values.yaml

@@ -431,8 +431,6 @@ probes: # Probes config for the container
 # Horizontal Pod Autoscaling support.
 hpa:
   enabled: false
-  enforcerNameOverride: "" # Override the HPA name for the Wiz Admission Controller deployment.
-  auditLogsNameOverride: "" # Override the HPA name for the Wiz Audit Log Collector deployment.
   minReplicas: 2
   maxReplicas: 5
   enableCPU: true