pass in gateway kind for annotations

Author: jm96441n

control-plane/controllers/resources/api-gateway-controller.go

@@ -63,7 +63,7 @@ func (r *APIGatewayController) Reconcile(ctx context.Context, req ctrl.Request)
 		if err := onCreateUpdate(ctx, r.Client, gatewayConfigs{
 			gcc:           gcc,
 			gatewayConfig: r.GatewayConfig,
-		}, resource); err != nil {
+		}, resource, gateways.APIGatewayAnnotationKind); err != nil {
 			logger.Error(err, "unable to create/update gateway")
 			return ctrl.Result{}, err
 		}

control-plane/controllers/resources/gateway_controller_crud.go

@@ -34,8 +34,8 @@ type gatewayConfigs struct {
 //  3. Service
 //  4. Role
 //  5. RoleBinding
-func onCreateUpdate[T gateways.Gateway](ctx context.Context, k8sClient client.Client, cfg gatewayConfigs, resource T) error {
-	builder := gateways.NewGatewayBuilder[T](resource, cfg.gatewayConfig, cfg.gcc)
+func onCreateUpdate[T gateways.Gateway](ctx context.Context, k8sClient client.Client, cfg gatewayConfigs, resource T, gatewayKind string) error {
+	builder := gateways.NewGatewayBuilder[T](resource, cfg.gatewayConfig, cfg.gcc, gatewayKind)
 
 	// Create ServiceAccount
 	desiredAccount := builder.ServiceAccount()

control-plane/controllers/resources/mesh_gateway_controller.go

@@ -64,7 +64,7 @@ func (r *MeshGatewayController) Reconcile(ctx context.Context, req ctrl.Request)
 		if err := onCreateUpdate(ctx, r.Client, gatewayConfigs{
 			gcc:           gcc,
 			gatewayConfig: r.GatewayConfig,
-		}, resource); err != nil {
+		}, resource, gateways.MeshGatewayAnnotationKind); err != nil {
 			return ctrl.Result{}, err
 		}
 	}

control-plane/gateways/builder.go

@@ -20,17 +20,19 @@ type Gateway interface {
 // This includes Deployment, Role, Service, and ServiceAccount resources.
 // Configuration is combined from the MeshGateway, GatewayConfig, and GatewayClassConfig.
 type gatewayBuilder[T Gateway] struct {
-	gateway T
-	gcc     *meshv2beta1.GatewayClassConfig
-	config  GatewayConfig
+	gateway     T
+	gcc         *meshv2beta1.GatewayClassConfig
+	config      GatewayConfig
+	gatewayKind string
 }
 
 // NewGatewayBuilder returns a new meshGatewayBuilder for the given MeshGateway,
 // GatewayConfig, and GatewayClassConfig.
-func NewGatewayBuilder[T Gateway](gateway T, gatewayConfig GatewayConfig, gatewayClassConfig *meshv2beta1.GatewayClassConfig) *gatewayBuilder[T] {
+func NewGatewayBuilder[T Gateway](gateway T, gatewayConfig GatewayConfig, gatewayClassConfig *meshv2beta1.GatewayClassConfig, gatewayKind string) *gatewayBuilder[T] {
 	return &gatewayBuilder[T]{
-		gateway: gateway,
-		config:  gatewayConfig,
-		gcc:     gatewayClassConfig,
+		gateway:     gateway,
+		config:      gatewayConfig,
+		gcc:         gatewayClassConfig,
+		gatewayKind: gatewayKind,
 	}
 }

control-plane/gateways/deployment.go

@@ -15,7 +15,8 @@ import (
 
 const (
 	globalDefaultInstances    int32 = 1
-	meshGatewayAnnotationKind       = "mesh-gateway"
+	MeshGatewayAnnotationKind       = "mesh-gateway"
+	APIGatewayAnnotationKind        = "api-gateway"
 )
 
 func (b *gatewayBuilder[T]) Deployment() (*appsv1.Deployment, error) {
@@ -67,7 +68,7 @@ func (b *gatewayBuilder[T]) deploymentSpec() (*appsv1.DeploymentSpec, error) {
 				Annotations: map[string]string{
 					// Indicate that this pod is a mesh gateway pod so that the Pod controller,
 					// consul-k8s CLI, etc. can key off of it
-					constants.AnnotationGatewayKind: meshGatewayAnnotationKind,
+					constants.AnnotationGatewayKind: b.gatewayKind,
 					// It's not logical to add a proxy sidecar since our workload is itself a proxy
 					constants.AnnotationMeshInject: "false",
 					// This functionality only applies when proxy sidecars are used