sync CRDs from projectcontour/contour (#499)

Signed-off-by: Steve Kriss <krisss@vmware.com>
projectcontour · Mar 28, 2022 · b9392fe · b9392fe
1 parent 83f374f
commit b9392fe
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 16 deletions.
diff --git a/config/crd/contour/01-crds.yaml b/config/crd/contour/01-crds.yaml
@@ -494,14 +494,26 @@ spec:
                   that Contour is configured to serve traffic.
                 properties:
                   controllerName:
-                    default: projectcontour.io/projectcontour/contour
                     description: ControllerName is used to determine whether Contour
                       should reconcile a GatewayClass. The string takes the form of
                       "projectcontour.io/<namespace>/contour". If unset, the gatewayclass
-                      controller will not be started.
+                      controller will not be started. Exactly one of ControllerName
+                      or GatewayRef must be set.
                     type: string
-                required:
-                - controllerName
+                  gatewayRef:
+                    description: GatewayRef defines a specific Gateway that this Contour
+                      instance corresponds to. If set, Contour will reconcile only
+                      this gateway, and will not reconcile any gateway classes. Exactly
+                      one of ControllerName or GatewayRef must be set.
+                    properties:
+                      name:
+                        type: string
+                      namespace:
+                        type: string
+                    required:
+                    - name
+                    - namespace
+                    type: object
                 type: object
               health:
                 default:
@@ -1451,14 +1463,26 @@ spec:
                       that Contour is configured to serve traffic.
                     properties:
                       controllerName:
-                        default: projectcontour.io/projectcontour/contour
                         description: ControllerName is used to determine whether Contour
                           should reconcile a GatewayClass. The string takes the form
                           of "projectcontour.io/<namespace>/contour". If unset, the
-                          gatewayclass controller will not be started.
+                          gatewayclass controller will not be started. Exactly one
+                          of ControllerName or GatewayRef must be set.
                         type: string
-                    required:
-                    - controllerName
+                      gatewayRef:
+                        description: GatewayRef defines a specific Gateway that this
+                          Contour instance corresponds to. If set, Contour will reconcile
+                          only this gateway, and will not reconcile any gateway classes.
+                          Exactly one of ControllerName or GatewayRef must be set.
+                        properties:
+                          name:
+                            type: string
+                          namespace:
+                            type: string
+                        required:
+                        - name
+                        - namespace
+                        type: object
                     type: object
                   health:
                     default:

diff --git a/examples/operator/operator.yaml b/examples/operator/operator.yaml
@@ -500,14 +500,26 @@ spec:
                   that Contour is configured to serve traffic.
                 properties:
                   controllerName:
-                    default: projectcontour.io/projectcontour/contour
                     description: ControllerName is used to determine whether Contour
                       should reconcile a GatewayClass. The string takes the form of
                       "projectcontour.io/<namespace>/contour". If unset, the gatewayclass
-                      controller will not be started.
+                      controller will not be started. Exactly one of ControllerName
+                      or GatewayRef must be set.
                     type: string
-                required:
-                - controllerName
+                  gatewayRef:
+                    description: GatewayRef defines a specific Gateway that this Contour
+                      instance corresponds to. If set, Contour will reconcile only
+                      this gateway, and will not reconcile any gateway classes. Exactly
+                      one of ControllerName or GatewayRef must be set.
+                    properties:
+                      name:
+                        type: string
+                      namespace:
+                        type: string
+                    required:
+                    - name
+                    - namespace
+                    type: object
                 type: object
               health:
                 default:
@@ -1457,14 +1469,26 @@ spec:
                       that Contour is configured to serve traffic.
                     properties:
                       controllerName:
-                        default: projectcontour.io/projectcontour/contour
                         description: ControllerName is used to determine whether Contour
                           should reconcile a GatewayClass. The string takes the form
                           of "projectcontour.io/<namespace>/contour". If unset, the
-                          gatewayclass controller will not be started.
+                          gatewayclass controller will not be started. Exactly one
+                          of ControllerName or GatewayRef must be set.
                         type: string
-                    required:
-                    - controllerName
+                      gatewayRef:
+                        description: GatewayRef defines a specific Gateway that this
+                          Contour instance corresponds to. If set, Contour will reconcile
+                          only this gateway, and will not reconcile any gateway classes.
+                          Exactly one of ControllerName or GatewayRef must be set.
+                        properties:
+                          name:
+                            type: string
+                          namespace:
+                            type: string
+                        required:
+                        - name
+                        - namespace
+                        type: object
                     type: object
                   health:
                     default: