Implementation for new Ingress API introduced in Single Node + Worker…

…s enhancement

See the enhancement https://github.com/openshift/enhancements/blob/master/enhancements/single-node/single-node-openshift-with-workers.md for more information

config/v1/0000_10_config-operator_01_ingress.crd.yaml

@@ -268,6 +268,13 @@ spec:
                             resource:
                               description: resource of the referent.
                               type: string
+                defaultPlacement:
+                  description: "defaultPlacement is set at installation time to control which nodes will host the ingress router pods by default. The options are control-plane nodes or worker nodes. \n This field works by dictating how the Cluster Ingress Operator will consider unset replicas and nodePlacement fields in IngressController resources when creating the corresponding Deployments. \n See the documentation for the IngressController replicas and nodePlacement fields for more information. \n When omitted, the default value is Workers"
+                  type: string
+                  default: Workers
+                  enum:
+                    - ControlPlane
+                    - Workers
       served: true
       storage: true
       subresources:

config/v1/types_ingress.go

@@ -112,6 +112,24 @@ type IngressStatus struct {
 	// hostnames and serving certificates can be customized by the cluster-admin.
 	// +optional
 	ComponentRoutes []ComponentRouteStatus `json:"componentRoutes,omitempty"`
+
+	// defaultPlacement is set at installation time to control which
+	// nodes will host the ingress router pods by default. The options are
+	// control-plane nodes or worker nodes.
+	//
+	// This field works by dictating how the Cluster Ingress Operator will
+	// consider unset replicas and nodePlacement fields in IngressController
+	// resources when creating the corresponding Deployments.
+	//
+	// See the documentation for the IngressController replicas and nodePlacement
+	// fields for more information.
+	//
+	// When omitted, the default value is Workers
+	//
+	// +kubebuilder:validation:Enum:="ControlPlane";"Workers"
+	// +kubebuilder:default:="Workers"
+	// +optional
+	DefaultPlacement DefaultPlacement `json:"defaultPlacement"`
 }
 
 // ComponentRouteSpec allows for configuration of a route's hostname and serving certificate.
@@ -222,3 +240,14 @@ type IngressList struct {
 
 	Items []Ingress `json:"items"`
 }
+
+// DefaultPlacement defines the default placement of ingress router pods.
+type DefaultPlacement string
+
+const (
+	// "Workers" is for having router pods placed on worker nodes by default
+	DefaultPlacementWorkers DefaultPlacement = "Workers"
+
+	// "ControlPlane" is for having router pods placed on control-plane nodes by default
+	DefaultPlacementControlPlane DefaultPlacement = "ControlPlane"
+)

operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml

@@ -806,9 +806,14 @@ spec:
                 properties:
                   nodeSelector:
                     description: "nodeSelector is the node selector applied to ingress
-                      controller deployments. \n If unset, the default is: \n   kubernetes.io/os:
-                      linux   node-role.kubernetes.io/worker: '' \n If set, the specified
-                      selector is used and replaces the default."
+                      controller deployments. \n If set, the specified selector is
+                      used and replaces the default. \n If unset, the default depends
+                      on the value of the defaultPlacement field in the cluster config.openshift.io/v1/ingresses
+                      status. \n When defaultPlacement is Workers, the default is:
+                      \n   kubernetes.io/os: linux   node-role.kubernetes.io/worker:
+                      '' \n When defaultPlacement is ControlPlane, the default is:
+                      \n   kubernetes.io/os: linux   node-role.kubernetes.io/master:
+                      ''"
                     properties:
                       matchExpressions:
                         description: matchExpressions is a list of label selector
@@ -896,8 +901,15 @@ spec:
                     type: array
                 type: object
               replicas:
-                description: replicas is the desired number of ingress controller
-                  replicas. If unset, defaults to 2.
+                description: "replicas is the desired number of ingress controller
+                  replicas. If unset, the default depends on the value of the defaultPlacement
+                  field in the cluster config.openshift.io/v1/ingresses status. \n
+                  The value of replicas is set based on the value of a chosen field
+                  in the Infrastructure CR. If defaultPlacement is set to ControlPlane,
+                  the chosen field will be controlPlaneTopology. If it is set to Workers
+                  the chosen field will be infrastructureTopology. Replicas will then
+                  be set to 1 or 2 based whether the chosen field's value is SingleReplica
+                  or HighlyAvailable, respectively."
                 format: int32
                 type: integer
               routeAdmission:

operator/v1/types_ingress.go

@@ -76,7 +76,15 @@ type IngressControllerSpec struct {
 	HttpErrorCodePages configv1.ConfigMapNameReference `json:"httpErrorCodePages,omitempty"`
 
 	// replicas is the desired number of ingress controller replicas. If unset,
-	// defaults to 2.
+	// the default depends on the value of the defaultPlacement field in the
+	// cluster config.openshift.io/v1/ingresses status.
+	//
+	// The value of replicas is set based on the value of a chosen field in the
+	// Infrastructure CR. If defaultPlacement is set to ControlPlane, the
+	// chosen field will be controlPlaneTopology. If it is set to Workers the
+	// chosen field will be infrastructureTopology. Replicas will then be set to 1
+	// or 2 based whether the chosen field's value is SingleReplica or
+	// HighlyAvailable, respectively.
 	//
 	// +optional
 	Replicas *int32 `json:"replicas,omitempty"`
@@ -292,12 +300,20 @@ type NodePlacement struct {
 	// nodeSelector is the node selector applied to ingress controller
 	// deployments.
 	//
-	// If unset, the default is:
+	// If set, the specified selector is used and replaces the default.
+	//
+	// If unset, the default depends on the value of the defaultPlacement
+	// field in the cluster config.openshift.io/v1/ingresses status.
+	//
+	// When defaultPlacement is Workers, the default is:
 	//
 	//   kubernetes.io/os: linux
 	//   node-role.kubernetes.io/worker: ''
 	//
-	// If set, the specified selector is used and replaces the default.
+	// When defaultPlacement is ControlPlane, the default is:
+	//
+	//   kubernetes.io/os: linux
+	//   node-role.kubernetes.io/master: ''
 	//
 	// +optional
 	NodeSelector *metav1.LabelSelector `json:"nodeSelector,omitempty"`