Simplified custom requests and limits

Author: ofirc-wiz

wiz-admission-controller/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.7.0
+version: 3.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

wiz-admission-controller/templates/deploymentauditlogs.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ include "wiz-kubernetes-audit-log-collector.name" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    {{- include "wiz-hpa.labels" . | nindent 4 }}
+    {{- include "wiz-kubernetes-audit-log-collector.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.kubernetesAuditLogsWebhook.replicaCount }}
   selector:
@@ -184,7 +184,11 @@ spec:
             value: "true"
           {{- end }}
           resources:
+            {{- if hasKey .Values "resources" }}
             {{- toYaml .Values.resources | nindent 12 }}
+            {{- else }}
+            {}
+            {{- end }}
           volumeMounts:
           - mountPath: /var/server-certs
             name: server-certs

wiz-admission-controller/templates/deploymentenforcement.yaml

@@ -213,14 +213,20 @@ spec:
             value: "true"
           {{- end }}
           resources:
-            {{- if .Values.hpa.enabled }}
-            {{- if hasKey .Values.hpa "customResources" }}
-            {{- toYaml .Values.hpa.customResources | nindent 12 }}
+            {{- if not .Values.hpa.enabled }}
+            {{- if hasKey .Values "resources" }}
+            {{- toYaml .Values.resources | nindent 12 }}
             {{- else }}
-            {{- toYaml .Values.hpa.defaultResources | nindent 12 }}
+            {}
             {{- end }}
             {{- else }}
+            {{- if hasKey .Values "resources" }}
             {{- toYaml .Values.resources | nindent 12 }}
+            {{- else }}
+            requests:
+              cpu: 500m
+              memory: 300Mi
+            {{- end }}
             {{- end }}
           volumeMounts:
           - mountPath: /var/cache

wiz-admission-controller/values.yaml

@@ -390,7 +390,9 @@ tlsCertificate:
   tlsCertificate: ""
   tlsKey: ""
 
-resources: {}
+# 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.
   # requests:
@@ -437,21 +439,6 @@ hpa:
   targetMemoryUtilizationPercentage: 50
   customMetrics: []
 
-  # When using HPA, Wiz Helm Charts process the requests and limits
-  # for the Wiz Admission Controller deployment in the following order:
-  # customResources -> defaultResources
-  #
-  # Populating the following `customResources` in your user-supplied values.yaml
-  # allows you to customize and override the `defaultResources`.
-  #
-  # customResources: {}
-
-  defaultResources:
-    requests:
-      cpu: 500m
-      memory: 300Mi
-
-
 # Global values to override chart values.
 global:
   nameOverride: "" # Override the release’s name.