Formatting and some refactorings

Author: ofirc-wiz

wiz-admission-controller/templates/_helpers.tpl

@@ -41,7 +41,7 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 
 {{- define "wiz-hpa-enforcer.name" -}}
-{{- $name := "wiz-hpa-enforcer" }}
+{{- $name := printf "%s-hpa" (include "wiz-admission-controller.fullname" .) }}
 {{- default $name .Values.hpa.enforcerNameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -216,19 +216,15 @@ Use for debug purpose only.
 {{- end -}}
 
 {{- define "wiz-admission-controller.resources" -}}
-{{- if not .Values.hpa.enabled }}
-{{- if hasKey .Values "resources" }}
-{{- toYaml .Values.resources }}
-{{- else -}}
-{}
-{{- end -}}
-{{- else }}
 {{- if hasKey .Values "resources" }}
 {{- toYaml .Values.resources }}
 {{- else -}}
+{{- if .Values.hpa.enabled }}
 requests:
     cpu: 500m
     memory: 300Mi
+{{- else }}
+{}
 {{- end -}}
 {{- end -}}
 {{- end -}}

wiz-admission-controller/templates/hpa.yaml

@@ -81,4 +81,4 @@ spec:
     {{- toYaml .Values.hpa.behavior | nindent 4 }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

wiz-admission-controller/templates/opawebhook.yaml

@@ -163,7 +163,8 @@ webhooks:
   failurePolicy: {{ .Values.debugWebhook.failurePolicy }}
   sideEffects: {{ .Values.debugWebhook.sideEffects }}
 {{- end }}
-{{- if and (or .Values.opaWebhook.enabled .Values.imageIntegrityWebhook.enabled .Values.kubernetesAuditLogsWebhook.enabled .Values.debugWebhook.enabled) (not $useCertManagerCerts) }}
+{{- $isEnabled := include "wiz-admission-controller.isEnforcerEnabled" . | trim | lower }}
+{{- if and (eq $isEnabled "true") (not $useCertManagerCerts) }}
 ---
 apiVersion: v1
 kind: Secret

wiz-admission-controller/templates/service.yaml

@@ -1,4 +1,5 @@
-{{- if or .Values.opaWebhook.enabled .Values.imageIntegrityWebhook.enabled .Values.debugWebhook.enabled}}
+{{- $isEnabled := include "wiz-admission-controller.isEnforcerEnabled" . | trim | lower }}
+{{- if eq $isEnabled "true" }}
 ---
 apiVersion: v1
 kind: Service

wiz-admission-controller/values.yaml

@@ -393,8 +393,8 @@ tlsCertificate:
 # Remove the comment below to provide custom requests and limits to the Wiz pods.
 #
 # resources: {}
-  # The recommended values should vary depending on the load in each cluster, the number of replicas, and more.
-  # To make sure we cover most cases, the following is a suggestion for environments with a high load, we recommend adjusting it based on your needs.
+  ## The recommended values should vary depending on the load in each cluster, the number of replicas, and more.
+  ## To make sure we cover most cases, the following is a suggestion for environments with a high load, we recommend adjusting it based on your needs.
   # requests:
   #   cpu: 0.5
   #   memory: 256M