added ability to set annotations on services, and made the default traffic policy to local. (#1406)

Author: hugosantos

internal/frontend/cuefrontend/node.go

@@ -277,9 +277,42 @@ func parseCueNode(ctx context.Context, env *schema.Environment, pl parsing.Early
 		if err != nil {
 			return err
 		}
+
 		node.Ingress = schema.Endpoint_Type(schema.Endpoint_Type_value[v])
 	}
 
+	if serviceMetadata := v.LookupPath("annotations"); serviceMetadata.Exists() {
+		var m map[string]string
+		if err := serviceMetadata.Val.Decode(&m); err != nil {
+			return err
+		}
+
+		annotations := &schema.ServiceAnnotations{}
+		for key, value := range m {
+			annotations.KeyValue = append(annotations.KeyValue, &schema.ServiceAnnotations_KeyValue{
+				Key:   key,
+				Value: value,
+			})
+		}
+
+		slices.SortFunc(annotations.KeyValue, func(a, b *schema.ServiceAnnotations_KeyValue) int {
+			if a.Key == b.Key {
+				return strings.Compare(a.Value, b.Value)
+			}
+
+			return strings.Compare(a.Key, b.Key)
+		})
+
+		pb, err := anypb.New(annotations)
+		if err != nil {
+			return err
+		}
+
+		node.ServiceMetadata = append(node.ServiceMetadata, &schema.ServiceMetadata{
+			Details: pb,
+		})
+	}
+
 	if e := v.LookupPath("exportServicesAsHttp"); e.Exists() {
 		_, err := e.Val.Bool()
 		if err != nil {

internal/planning/endpoints.go

@@ -66,7 +66,7 @@ func ComputeEndpoints(planner runtime.Planner, srv Server, merged *schema.Server
 			}
 		}
 
-		nd, err := computeServiceEndpoint(planner, sch.Server, lst, pkg, service, service.GetIngress())
+		nd, err := computeServiceEndpoint(planner, sch.Server, lst, service)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -148,7 +148,7 @@ func findPort(serverPorts []*schema.Endpoint_Port, name string) *schema.Endpoint
 }
 
 // XXX this should be somewhere else.
-func computeServiceEndpoint(planner runtime.Planner, server *schema.Server, listener *schema.Listener, pkg *pkggraph.Package, n *schema.Node, t schema.Endpoint_Type) ([]*schema.Endpoint, error) {
+func computeServiceEndpoint(planner runtime.Planner, server *schema.Server, listener *schema.Listener, n *schema.Node) ([]*schema.Endpoint, error) {
 	var endpoints []*schema.Endpoint
 
 	exportedPort := n.ExportedPort
@@ -162,15 +162,18 @@ func computeServiceEndpoint(planner runtime.Planner, server *schema.Server, list
 			name := n.GetIngressServiceName() + "-" + server.Id
 			short, fqdn := planner.MakeServiceName(name)
 
-			endpoints = append(endpoints, &schema.Endpoint{
+			endpoint := &schema.Endpoint{
 				ServiceName:        name,
 				AllocatedName:      short,
 				FullyQualifiedName: fqdn,
 				EndpointOwner:      n.GetPackageName(),
 				ServerOwner:        server.GetPackageName(),
-				Type:               t,
+				Type:               n.GetIngress(),
+				ServiceMetadata:    n.GetServiceMetadata(),
 				Ports:              []*schema.Endpoint_PortMap{{ExportedPort: exportedPort, Port: listener.Port}},
-			})
+			}
+
+			endpoints = append(endpoints, endpoint)
 		}
 	} else {
 		for k, exported := range n.ExportService {
@@ -188,7 +191,8 @@ func computeServiceEndpoint(planner runtime.Planner, server *schema.Server, list
 				FullyQualifiedName: fqdn,
 				EndpointOwner:      n.GetPackageName(),
 				ServerOwner:        server.GetPackageName(),
-				Type:               t,
+				Type:               n.GetIngress(),
+				ServiceMetadata:    n.GetServiceMetadata(),
 				Ports:              []*schema.Endpoint_PortMap{{ExportedPort: exportedPort, Port: listener.Port}},
 			}
 

internal/runtime/kubernetes/deployment.go

@@ -1198,7 +1198,9 @@ func deployEndpoint(ctx context.Context, r BoundNamespace, deployable runtime.De
 	serviceSpec = serviceSpec.WithPorts(applied...)
 
 	if endpoint.Type == schema.Endpoint_LOAD_BALANCER {
-		serviceSpec = serviceSpec.WithType(corev1.ServiceTypeLoadBalancer)
+		// Default to LOCAL.
+		serviceSpec = serviceSpec.WithType(corev1.ServiceTypeLoadBalancer).
+			WithExternalTrafficPolicy(corev1.ServiceExternalTrafficPolicyLocal)
 	}
 
 	if endpoint.Headless {

internal/versions/versions.json

@@ -1,5 +1,5 @@
 {
-	"api_version": 145,
+	"api_version": 146,
 	"minimum_api_version": 40,
 	"cache_version": 1
-}
+}