Adding Contour Ingress support (#82)

Author: dobrerazvan

api/v1beta1/kafkacluster_types.go

@@ -155,7 +155,7 @@ type KafkaClusterSpec struct {
 	RollingUpgradeConfig        RollingUpgradeConfig    `json:"rollingUpgradeConfig"`
 	// Selector for broker pods that need to be recycled/reconciled
 	TaintedBrokersSelector *metav1.LabelSelector `json:"taintedBrokersSelector,omitempty"`
-	// +kubebuilder:validation:Enum=envoy;istioingress
+	// +kubebuilder:validation:Enum=envoy;contour;istioingress
 	// IngressController specifies the type of the ingress controller to be used for external listeners. The `istioingress` ingress controller type requires the `spec.istioControlPlane` field to be populated as well.
 	IngressController string `json:"ingressController,omitempty"`
 	// IstioControlPlane is a reference to the IstioControlPlane resource for envoy configuration. It must be specified if istio ingress is used.
@@ -167,13 +167,14 @@ type KafkaClusterSpec struct {
 	// when false, they will be kept so the Kafka cluster remains available for those Kafka clients which are still using the previous ingress setting.
 	// +kubebuilder:default=false
 	// +optional
-	RemoveUnusedIngressResources bool                `json:"removeUnusedIngressResources,omitempty"`
-	PropagateLabels              bool                `json:"propagateLabels,omitempty"`
-	CruiseControlConfig          CruiseControlConfig `json:"cruiseControlConfig"`
-	EnvoyConfig                  EnvoyConfig         `json:"envoyConfig,omitempty"`
-	MonitoringConfig             MonitoringConfig    `json:"monitoringConfig,omitempty"`
-	AlertManagerConfig           *AlertManagerConfig `json:"alertManagerConfig,omitempty"`
-	IstioIngressConfig           IstioIngressConfig  `json:"istioIngressConfig,omitempty"`
+	RemoveUnusedIngressResources bool                 `json:"removeUnusedIngressResources,omitempty"`
+	PropagateLabels              bool                 `json:"propagateLabels,omitempty"`
+	CruiseControlConfig          CruiseControlConfig  `json:"cruiseControlConfig"`
+	EnvoyConfig                  EnvoyConfig          `json:"envoyConfig,omitempty"`
+	ContourIngressConfig         ContourIngressConfig `json:"contourIngressConfig,omitempty"`
+	MonitoringConfig             MonitoringConfig     `json:"monitoringConfig,omitempty"`
+	AlertManagerConfig           *AlertManagerConfig  `json:"alertManagerConfig,omitempty"`
+	IstioIngressConfig           IstioIngressConfig   `json:"istioIngressConfig,omitempty"`
 	// Envs defines environment variables for Kafka broker Pods.
 	// Adding the "+" prefix to the name prepends the value to that environment variable instead of overwriting it.
 	// Add the "+" suffix to append.
@@ -593,6 +594,10 @@ func (c IngressServiceSettings) GetServiceType() corev1.ServiceType {
 	return c.ServiceType
 }
 
+func (c ContourIngressConfig) GetBrokerFqdn(brokerId int32) string {
+	return strings.Replace(c.BrokerFQDNTemplate, "%id", strconv.Itoa(int(brokerId)), 1)
+}
+
 // Replace %id in brokerHostnameTemplate with actual broker id
 func (c EnvoyConfig) GetBrokerHostname(brokerId int32) string {
 	return strings.Replace(c.BrokerHostnameTemplate, "%id", strconv.Itoa(int(brokerId)), 1)
@@ -673,7 +678,7 @@ type ExternalListenerConfig struct {
 	// IngressControllerTargetPort defines the container port that the ingress controller uses for handling external traffic.
 	// If not defined, 29092 will be used as the default IngressControllerTargetPort value.
 	IngressControllerTargetPort *int32 `json:"ingressControllerTargetPort,omitempty"`
-	// +kubebuilder:validation:Enum=LoadBalancer;NodePort
+	// +kubebuilder:validation:Enum=LoadBalancer;NodePort;ClusterIP
 	// accessMethod defines the method which the external listener is exposed through.
 	// Two types are supported LoadBalancer and NodePort.
 	// The recommended and default is the LoadBalancer.
@@ -696,8 +701,16 @@ type Config struct {
 
 type IngressConfig struct {
 	IngressServiceSettings `json:",inline"`
-	IstioIngressConfig     *IstioIngressConfig `json:"istioIngressConfig,omitempty"`
-	EnvoyConfig            *EnvoyConfig        `json:"envoyConfig,omitempty"`
+	IstioIngressConfig     *IstioIngressConfig   `json:"istioIngressConfig,omitempty"`
+	EnvoyConfig            *EnvoyConfig          `json:"envoyConfig,omitempty"`
+	ContourIngressConfig   *ContourIngressConfig `json:"contourIngressConfig,omitempty"`
+}
+
+type ContourIngressConfig struct {
+	// TLS secret used for Contour IngressRoute resource
+	TLSSecretName string `json:"tlsSecretName"`
+	// Broker hostname template for Contour IngressRoute resource to generate broker hostnames.
+	BrokerFQDNTemplate string `json:"brokerFQDNTemplate"`
 }
 
 // InternalListenerConfig defines the internal listener config for Kafka

api/v1beta1/zz_generated.deepcopy.go

@@ -12899,6 +12899,19 @@ spec:
                 type: string
               clusterWideConfig:
                 type: string
+              contourIngressConfig:
+                properties:
+                  brokerFQDNTemplate:
+                    description: Broker hostname template for Contour IngressRoute
+                      resource to generate broker hostnames.
+                    type: string
+                  tlsSecretName:
+                    description: TLS secret used for Contour IngressRoute resource
+                    type: string
+                required:
+                - brokerFQDNTemplate
+                - tlsSecretName
+                type: object
               cruiseControlConfig:
                 description: CruiseControlConfig defines the config for Cruise Control
                 properties:
@@ -18817,6 +18830,7 @@ spec:
                   as well.
                 enum:
                 - envoy
+                - contour
                 - istioingress
                 type: string
               istioControlPlane:
@@ -19171,6 +19185,7 @@ spec:
                           enum:
                           - LoadBalancer
                           - NodePort
+                          - ClusterIP
                           type: string
                         anyCastPort:
                           description: configuring AnyCastPort allows kafka cluster
@@ -19190,6 +19205,21 @@ spec:
                             ingressConfig:
                               additionalProperties:
                                 properties:
+                                  contourIngressConfig:
+                                    properties:
+                                      brokerFQDNTemplate:
+                                        description: Broker hostname template for
+                                          Contour IngressRoute resource to generate
+                                          broker hostnames.
+                                        type: string
+                                      tlsSecretName:
+                                        description: TLS secret used for Contour IngressRoute
+                                          resource
+                                        type: string
+                                    required:
+                                    - brokerFQDNTemplate
+                                    - tlsSecretName
+                                    type: object
                                   envoyConfig:
                                     description: EnvoyConfig defines the config for
                                       Envoy

charts/kafka-operator/crds/kafkaclusters.yaml

@@ -12899,6 +12899,19 @@ spec:
                 type: string
               clusterWideConfig:
                 type: string
+              contourIngressConfig:
+                properties:
+                  brokerFQDNTemplate:
+                    description: Broker hostname template for Contour IngressRoute
+                      resource to generate broker hostnames.
+                    type: string
+                  tlsSecretName:
+                    description: TLS secret used for Contour IngressRoute resource
+                    type: string
+                required:
+                - brokerFQDNTemplate
+                - tlsSecretName
+                type: object
               cruiseControlConfig:
                 description: CruiseControlConfig defines the config for Cruise Control
                 properties:
@@ -18817,6 +18830,7 @@ spec:
                   as well.
                 enum:
                 - envoy
+                - contour
                 - istioingress
                 type: string
               istioControlPlane:
@@ -19171,6 +19185,7 @@ spec:
                           enum:
                           - LoadBalancer
                           - NodePort
+                          - ClusterIP
                           type: string
                         anyCastPort:
                           description: configuring AnyCastPort allows kafka cluster
@@ -19190,6 +19205,21 @@ spec:
                             ingressConfig:
                               additionalProperties:
                                 properties:
+                                  contourIngressConfig:
+                                    properties:
+                                      brokerFQDNTemplate:
+                                        description: Broker hostname template for
+                                          Contour IngressRoute resource to generate
+                                          broker hostnames.
+                                        type: string
+                                      tlsSecretName:
+                                        description: TLS secret used for Contour IngressRoute
+                                          resource
+                                        type: string
+                                    required:
+                                    - brokerFQDNTemplate
+                                    - tlsSecretName
+                                    type: object
                                   envoyConfig:
                                     description: EnvoyConfig defines the config for
                                       Envoy