From e5db5d8a0fbd6578ea8fee4a3b19e1fc6dbc8437 Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Wed, 29 May 2024 23:04:52 +0200
Subject: [PATCH] feat: add actual grpc service

Signed-off-by: kjuulh <contact@kjuulh.io>
---
 crates/cuddle-clusters/src/catalog/ingress.rs      | 14 +++++++++-----
 .../tests/with_ingress/expected/dev/ingress.yaml   |  6 ++----
 .../tests/with_ingress/expected/prod/ingress.yaml  |  6 ++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/crates/cuddle-clusters/src/catalog/ingress.rs b/crates/cuddle-clusters/src/catalog/ingress.rs
index 9da50d8..9fa90cf 100644
--- a/crates/cuddle-clusters/src/catalog/ingress.rs
+++ b/crates/cuddle-clusters/src/catalog/ingress.rs
@@ -37,6 +37,14 @@ impl Ingress {
 <% if connection_type is defined %><<connection_type>>.<% endif %>{{ host_name }}.{{ environment }}.<< base_host >>
 <%- endmacro %>
 
+ <%- macro k8s_service() -%>
+ <%- if connection_type == "grpc" -%>
+{{ service_name }}-grpc
+ <%- else -%>
+{{ service_name }}
+ <%- endif -%>
+ <%- endmacro %>
+
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -45,10 +53,6 @@ metadata:
     cert-manager.io/issuer: << issuer >>
     traefik.ingress.kubernetes.io/router.entrypoints: web
     traefik.ingress.kubernetes.io/router.tls: "true"
-    <%- if connection_type == "grpc" %>
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
-    traefik.ingress.kubernetes.io/service.server.scheme: h2c
-    <%- endif %>
   labels:
     app: {{ service_name }}
     cluster: {{ vars.cluster_vars.name }}
@@ -61,7 +65,7 @@ spec:
       paths:
       - backend:
           service:
-            name: {{ service_name }}
+            name: << k8s_service() >>
             port:
               name: << name >>
         path: /
diff --git a/crates/cuddle-clusters/tests/with_ingress/expected/dev/ingress.yaml b/crates/cuddle-clusters/tests/with_ingress/expected/dev/ingress.yaml
index 495ed68..b7d7d60 100644
--- a/crates/cuddle-clusters/tests/with_ingress/expected/dev/ingress.yaml
+++ b/crates/cuddle-clusters/tests/with_ingress/expected/dev/ingress.yaml
@@ -68,7 +68,6 @@ metadata:
     cert-manager.io/issuer: kjuulh-app
     traefik.ingress.kubernetes.io/router.entrypoints: web
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
   labels:
     app: service
     cluster: dev
@@ -81,7 +80,7 @@ spec:
       paths:
       - backend:
           service:
-            name: service
+            name: service-grpc
             port:
               name: external-grpc
         path: /
@@ -99,7 +98,6 @@ metadata:
     cert-manager.io/issuer: kjuulh-app
     traefik.ingress.kubernetes.io/router.entrypoints: web
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
   labels:
     app: service
     cluster: dev
@@ -112,7 +110,7 @@ spec:
       paths:
       - backend:
           service:
-            name: service
+            name: service-grpc
             port:
               name: internal-grpc
         path: /
diff --git a/crates/cuddle-clusters/tests/with_ingress/expected/prod/ingress.yaml b/crates/cuddle-clusters/tests/with_ingress/expected/prod/ingress.yaml
index 4db52da..0847f5f 100644
--- a/crates/cuddle-clusters/tests/with_ingress/expected/prod/ingress.yaml
+++ b/crates/cuddle-clusters/tests/with_ingress/expected/prod/ingress.yaml
@@ -68,7 +68,6 @@ metadata:
     cert-manager.io/issuer: kjuulh-app
     traefik.ingress.kubernetes.io/router.entrypoints: web
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
   labels:
     app: service
     cluster: prod
@@ -81,7 +80,7 @@ spec:
       paths:
       - backend:
           service:
-            name: service
+            name: service-grpc
             port:
               name: external-grpc
         path: /
@@ -99,7 +98,6 @@ metadata:
     cert-manager.io/issuer: kjuulh-app
     traefik.ingress.kubernetes.io/router.entrypoints: web
     traefik.ingress.kubernetes.io/router.tls: "true"
-    traefik.ingress.kubernetes.io/service.serversscheme: h2c
   labels:
     app: service
     cluster: prod
@@ -112,7 +110,7 @@ spec:
       paths:
       - backend:
           service:
-            name: service
+            name: service-grpc
             port:
               name: internal-grpc
         path: /