feat: support gatewayAPI

api/v1beta1/grafana_types.go

@@ -71,6 +71,8 @@ type GrafanaSpec struct {
 	Ingress *IngressNetworkingV1 `json:"ingress,omitempty"`
 	// Route sets how the ingress object should look like with your grafana instance, this only works in Openshift.
 	Route *RouteOpenshiftV1 `json:"route,omitempty"`
+	// HTTPRoute sets how the ingress object should look like with your grafana instance, this only works use gateway api.
+	HTTPRoute *HTTPRouteV1 `json:"httpRoute,omitempty"`
 	// Service sets how the service object should look like with your grafana instance, contains a number of defaults.
 	Service *ServiceV1 `json:"service,omitempty"`
 	// Version sets the tag of the default image: docker.io/grafana/grafana.

api/v1beta1/typeoverrides.go

@@ -13,6 +13,7 @@ import (
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // +kubebuilder:object:generate=true
@@ -327,6 +328,13 @@ type RouteOpenshiftV1 struct {
 	Spec       *RouteOpenShiftV1Spec `json:"spec,omitempty"`
 }
 
+// +kubebuilder:object:generate=true
+
+type HTTPRouteV1 struct {
+	ObjectMeta ObjectMeta            `json:"metadata,omitempty"`
+	Spec       gwapiv1.HTTPRouteSpec `json:"spec,omitempty"`
+}
+
 // RouteTargetReference specifies the target that resolve into endpoints. Only the 'Service'
 // kind is allowed. Use 'weight' field to emphasize one over others.
 type RouteTargetReference struct {

config/rbac/role.yaml

@@ -54,6 +54,26 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - gateways
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - grafana.integreatly.org
   resources:

controllers/grafana_controller.go

@@ -63,6 +63,8 @@ type GrafanaReconciler struct {
 // +kubebuilder:rbac:groups="",resources=events,verbs=get;list;watch;create;patch
 // +kubebuilder:rbac:groups="",resources=configmaps;secrets;serviceaccounts;services;persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=httproutes,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gateways,verbs=get;list;watch;
 
 func (r *GrafanaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := logf.FromContext(ctx).WithName("GrafanaReconciler")

controllers/model/grafana_resources.go

@@ -11,6 +11,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 func GetCommonLabels() map[string]string {
@@ -114,6 +115,19 @@ func GetGrafanaIngress(cr *grafanav1beta1.Grafana, scheme *runtime.Scheme) *v12.
 	return ingress
 }
 
+func GetGrafanaHTTPRoute(cr *grafanav1beta1.Grafana, scheme *runtime.Scheme) *gwapiv1.HTTPRoute {
+	httpRoute := &gwapiv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fmt.Sprintf("%s-httproute", cr.Name),
+			Namespace: cr.Namespace,
+			Labels:    GetCommonLabels(),
+		},
+	}
+	controllerutil.SetControllerReference(cr, httpRoute, scheme) //nolint:errcheck
+
+	return httpRoute
+}
+
 func GetGrafanaRoute(cr *grafanav1beta1.Grafana, scheme *runtime.Scheme) *routev1.Route {
 	route := &routev1.Route{
 		ObjectMeta: metav1.ObjectMeta{