api: enforce at least one service entry per route & tcpproxy

Fixes projectcontour#2270 Signed-off-by: Dave Cheney <dave@cheney.net>
davecheney · Feb 23, 2020 · 9e231f1 · 9e231f1
1 parent abf82cb
commit 9e231f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/apis/projectcontour/v1/httpproxy.go b/apis/projectcontour/v1/httpproxy.go
@@ -127,7 +127,8 @@ type Route struct {
 	// +optional
 	Conditions []Condition `json:"conditions,omitempty"`
 	// Services are the services to proxy traffic.
-	Services []Service `json:"services,omitempty"`
+	// +kubebuilder:validation:MinItems=1
+	Services []Service `json:"services"`
 	// Enables websocket support for the route.
 	// +optional
 	EnableWebsockets bool `json:"enableWebsockets,omitempty"`
@@ -173,6 +174,7 @@ type TCPProxy struct {
 	// +optional
 	LoadBalancerPolicy *LoadBalancerPolicy `json:"loadBalancerPolicy,omitempty"`
 	// Services are the services to proxy traffic
+	// +kubebuilder:validation:MinItems=1
 	Services []Service `json:"services,omitempty"`
 	// Include specifies that this tcpproxy should be delegated to another HTTPProxy.
 	// +optional

diff --git a/examples/contour/01-crds.yaml b/examples/contour/01-crds.yaml
@@ -862,6 +862,7 @@ spec:
                       - name
                       - port
                       type: object
+                    minItems: 1
                     type: array
                   timeoutPolicy:
                     description: The timeout policy for this route.
@@ -878,6 +879,8 @@ spec:
                           the timeout duration is undefined.
                         type: string
                     type: object
+                required:
+                - services
                 type: object
               type: array
             tcpproxy:
@@ -1043,6 +1046,7 @@ spec:
                     - name
                     - port
                     type: object
+                  minItems: 1
                   type: array
               type: object
             virtualhost:

diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
@@ -392,7 +392,7 @@ spec:
                         to the backing cluster.
                       type: boolean
                     secretName:
-                      description: required, the name of a secret in the current namespace
+                      description: required, the name of a secret in the current namespace.
                       type: string
                   type: object
               required:
@@ -936,6 +936,7 @@ spec:
                       - name
                       - port
                       type: object
+                    minItems: 1
                     type: array
                   timeoutPolicy:
                     description: The timeout policy for this route.
@@ -952,6 +953,8 @@ spec:
                           the timeout duration is undefined.
                         type: string
                     type: object
+                required:
+                - services
                 type: object
               type: array
             tcpproxy:
@@ -1117,6 +1120,7 @@ spec:
                     - name
                     - port
                     type: object
+                  minItems: 1
                   type: array
               type: object
             virtualhost:
@@ -1142,7 +1146,7 @@ spec:
                         to the backing cluster.
                       type: boolean
                     secretName:
-                      description: required, the name of a secret in the current namespace
+                      description: required, the name of a secret in the current namespace.
                       type: string
                   type: object
               required: