Merge pull request #2088 from emoreth/adds_min_and_max_to_limitrange

Adds min and max to LimitRange
loft-sh · Oct 7, 2024 · 869c78f · 869c78f
2 parents 9d9edf3 + ae28895
commit 869c78f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 0 deletions.
diff --git a/chart/templates/limitrange.yaml b/chart/templates/limitrange.yaml
@@ -32,6 +32,18 @@ spec:
       {{- range $key, $val := .Values.policies.limitRange.defaultRequest }}
       {{ $key }}: {{ $val | quote }}
       {{- end }}
+    {{- if .Values.policies.limitRange.min }}
+    min:
+      {{- range $key, $val := .Values.policies.limitRange.min }}
+      {{ $key }}: {{ $val | quote }}
+      {{- end }}
+    {{- end }}
+    {{- if .Values.policies.limitRange.max }}
+    max:
+      {{- range $key, $val := .Values.policies.limitRange.max }}
+      {{ $key }}: {{ $val | quote }}
+      {{- end }}
+    {{- end }}
     type: Container
 {{- end }}
 {{- end }}
diff --git a/chart/tests/limitrange_test.yaml b/chart/tests/limitrange_test.yaml
@@ -68,3 +68,27 @@ tests:
     asserts:
       - hasDocuments:
           count: 0
+
+  - it: check disabled both false
+    release:
+      name: my-release
+      namespace: my-namespace
+    set:
+      policies:
+        limitRange:
+          enabled: true
+          min:
+            cpu: 1
+          max:
+            memory: 256Mi
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: spec.limits[0].min.cpu
+          value: "1"
+      - equal:
+          path: spec.limits[0].max.memory
+          value: "256Mi"
+
+
diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -1950,6 +1950,14 @@
           "type": "object",
           "description": "DefaultRequest are the default request options for the limit range"
         },
+        "max": {
+          "type": "object",
+          "description": "Max are the max limits for the limit range"
+        },
+        "min": {
+          "type": "object",
+          "description": "Min are the min limits for the limit range"
+        },
         "annotations": {
           "additionalProperties": {
             "type": "string"

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -805,6 +805,10 @@ policies:
       ephemeral-storage: 3Gi
       memory: 128Mi
       cpu: 100m
+    # Min are the min limits for the limit range
+    min: {}
+    # Max are the max limits for the limit range
+    max: {}
 
   # NetworkPolicy specifies network policy options.
   networkPolicy:

diff --git a/config/config.go b/config/config.go
@@ -1603,6 +1603,12 @@ type LimitRange struct {
 	// DefaultRequest are the default request options for the limit range
 	DefaultRequest map[string]interface{} `json:"defaultRequest,omitempty"`
 
+	// Max are the max limits for the limit range
+	Max map[string]interface{} `json:"max,omitempty"`
+
+	// Min are the min limits for the limit range
+	Min map[string]interface{} `json:"min,omitempty"`
+
 	LabelsAndAnnotations `json:",inline"`
 }
 

diff --git a/config/values.yaml b/config/values.yaml
@@ -478,6 +478,8 @@ policies:
       ephemeral-storage: 3Gi
       memory: 128Mi
       cpu: 100m
+    min: {}
+    max: {}
 
   networkPolicy:
     enabled: false