Merge pull request #91 from sttts/sttts-integer-quota-4.2

Bug 1755125: 4.2 - ClusterResourceQuota: allow integer values
openshift · Sep 30, 2019 · 7e4895c · 7e4895c
2 parents cda861a + 65d8387
commit 7e4895c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/manifests/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml b/manifests/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
@@ -410,7 +410,9 @@ spec:
               properties:
                 hard:
                   additionalProperties:
-                    type: string
+                    anyOf:
+                    - type: string
+                    - type: integer
                   description: 'hard is the set of desired hard limits for each named
                     resource. More info: https://kubernetes.io/docs/concepts/policy/resource-quotas/'
                   type: object

diff --git a/manifests/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml-merge-patch b/manifests/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml-merge-patch
@@ -0,0 +1,14 @@
+spec:
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          properties:
+            quota:
+              properties:
+                hard:
+                  additionalProperties:
+                    anyOf:
+                    - type: string
+                    - type: integer
+                    type: null