Require rules field in APIRule CRD (#90)

kyma-project · Nov 25, 2019 · 295e8fc · 295e8fc
1 parent 40f0ce2
commit 295e8fc
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/api/v1alpha1/apiRule_types.go b/api/v1alpha1/apiRule_types.go
@@ -39,9 +39,9 @@ type APIRuleSpec struct {
 	// Gateway to be used
 	// +kubebuilder:validation:Pattern=^(?:[_a-z0-9](?:[_a-z0-9-]+[a-z0-9])?\.)+(?:[a-z](?:[a-z0-9-]+[a-z0-9])?)?$
 	Gateway *string `json:"gateway"`
-	//Paths represents collection of Path to secure
+	//Rules represents collection of Rule to apply
 	// +kubebuilder:validation:MinItems=1
-	Rules []Rule `json:"rules,omitempty"`
+	Rules []Rule `json:"rules"`
 }
 
 // APIRuleStatus defines the observed state of ApiRule

diff --git a/config/crd/bases/gateway.kyma-project.io_apirules.yaml b/config/crd/bases/gateway.kyma-project.io_apirules.yaml
@@ -392,7 +392,7 @@ spec:
               pattern: ^(?:[_a-z0-9](?:[_a-z0-9-]+[a-z0-9])?\.)+(?:[a-z](?:[a-z0-9-]+[a-z0-9])?)?$
               type: string
             rules:
-              description: Paths represents collection of Path to secure
+              description: Rules represents collection of Rule to apply
               items:
                 properties:
                   accessStrategies:
@@ -471,6 +471,7 @@ spec:
           required:
           - service
           - gateway
+          - rules
           type: object
         status:
           properties:

diff --git a/install/helm/api-gateway/files/crd-apirules.yaml b/install/helm/api-gateway/files/crd-apirules.yaml
@@ -392,7 +392,7 @@ spec:
               pattern: ^(?:[_a-z0-9](?:[_a-z0-9-]+[a-z0-9])?\.)+(?:[a-z](?:[a-z0-9-]+[a-z0-9])?)?$
               type: string
             rules:
-              description: Paths represents collection of Path to secure
+              description: Rules represents collection of Rule to apply
               items:
                 properties:
                   accessStrategies:
@@ -471,6 +471,7 @@ spec:
           required:
             - service
             - gateway
+            - rules
           type: object
         status:
           properties:

diff --git a/...iextensions.k8s.io_v1beta1_customresourcedefinition_apirules.gateway.kyma-project.io.yaml b/...iextensions.k8s.io_v1beta1_customresourcedefinition_apirules.gateway.kyma-project.io.yaml
@@ -131,7 +131,7 @@ spec:
                           this object.
                         type: string
                     required:
-                    - name
+                      - name
                     type: object
                   type: array
                 result:
@@ -263,7 +263,7 @@ spec:
                       type: string
                   type: object
               required:
-              - pending
+                - pending
               type: object
             labels:
               additionalProperties:
@@ -356,10 +356,10 @@ spec:
                     description: 'UID of the referent. More info: http://kubernetes.io/docs/user-guide/identifiers#uids'
                     type: string
                 required:
-                - apiVersion
-                - kind
-                - name
-                - uid
+                  - apiVersion
+                  - kind
+                  - name
+                  - uid
                 type: object
               type: array
             resourceVersion:
@@ -390,7 +390,7 @@ spec:
               pattern: ^(?:[_a-z0-9](?:[_a-z0-9-]+[a-z0-9])?\.)+(?:[a-z](?:[a-z0-9-]+[a-z0-9])?)?$
               type: string
             rules:
-              description: Paths represents collection of Path to secure
+              description: Rules represents collection of Rule to apply
               items:
                 properties:
                   accessStrategies:
@@ -405,7 +405,7 @@ spec:
                           description: Name is the name of a handler
                           type: string
                       required:
-                      - handler
+                        - handler
                       type: object
                     minItems: 1
                     type: array
@@ -426,16 +426,16 @@ spec:
                           description: Name is the name of a handler
                           type: string
                       required:
-                      - handler
+                        - handler
                       type: object
                     type: array
                   path:
                     description: Path to be exposed
                     pattern: ^/([0-9a-zA-Z./*]+)
                     type: string
                 required:
-                - path
-                - accessStrategies
+                  - path
+                  - accessStrategies
                 type: object
               minItems: 1
               type: array
@@ -462,13 +462,14 @@ spec:
                   minimum: 1
                   type: integer
               required:
-              - name
-              - port
-              - host
+                - name
+                - port
+                - host
               type: object
           required:
-          - service
-          - gateway
+            - service
+            - gateway
+            - rules
           type: object
         status:
           properties:
@@ -502,9 +503,9 @@ spec:
           type: object
       type: object
   versions:
-  - name: v1alpha1
-    served: true
-    storage: true
+    - name: v1alpha1
+      served: true
+      storage: true
 status:
   acceptedNames:
     kind: ""