From 28280d8a8e435126245f7b922600bb0304d4933a Mon Sep 17 00:00:00 2001
From: Leonard Cohnen <lc@edgeless.systems>
Date: Wed, 27 Sep 2023 14:48:57 +0200
Subject: [PATCH] helm: remove lb svc from verify deployment

---
 cli/internal/helm/BUILD.bazel                  |  1 -
 .../templates/loadbalancer-service.yaml        | 18 ------------------
 .../verification-service/values.schema.json    | 15 ++++++++-------
 cli/internal/helm/overrides.go                 |  1 -
 4 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/templates/loadbalancer-service.yaml

diff --git a/cli/internal/helm/BUILD.bazel b/cli/internal/helm/BUILD.bazel
index d9ec955063a..7eed07d222f 100644
--- a/cli/internal/helm/BUILD.bazel
+++ b/cli/internal/helm/BUILD.bazel
@@ -252,7 +252,6 @@ go_library(
         "charts/edgeless/constellation-services/charts/verification-service/.helmignore",
         "charts/edgeless/constellation-services/charts/verification-service/Chart.yaml",
         "charts/edgeless/constellation-services/charts/verification-service/templates/daemonset.yaml",
-        "charts/edgeless/constellation-services/charts/verification-service/templates/loadbalancer-service.yaml",
         "charts/edgeless/constellation-services/charts/verification-service/templates/nodeport-service.yaml",
         "charts/edgeless/constellation-services/charts/verification-service/values.schema.json",
         "charts/edgeless/constellation-services/charts/verification-service/values.yaml",
diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/templates/loadbalancer-service.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/templates/loadbalancer-service.yaml
deleted file mode 100644
index 8e2e45aaf17..00000000000
--- a/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/templates/loadbalancer-service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: verify
-  namespace: {{ .Release.Namespace }}
-spec:
-  allocateLoadBalancerNodePorts: false
-  externalIPs:
-  - {{ .Values.loadBalancerIP | quote }}
-  loadBalancerClass: constellation
-  ports:
-  - name: grpc
-    port: {{ .Values.grpcNodePort }}
-    protocol: TCP
-    targetPort: {{ .Values.grpcContainerPort }}
-  selector:
-    k8s-app: verification-service
-  type: LoadBalancer
diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/values.schema.json b/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/values.schema.json
index 56538fe4a96..7cc900e672e 100644
--- a/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/values.schema.json
+++ b/cli/internal/helm/charts/edgeless/constellation-services/charts/verification-service/values.schema.json
@@ -4,21 +4,22 @@
         "image": {
             "description": "Container image to use for the spawned pods.",
             "type": "string",
-            "examples": ["ghcr.io/edgelesssys/constellation/join-service:latest"]
-        },
-        "loadBalancerIP": {
-            "description": "IP of the k8s LB service",
-            "type": "string"
+            "examples": [
+                "ghcr.io/edgelesssys/constellation/join-service:latest"
+            ]
         },
         "attestationVariant": {
             "description": "Attestation variant to use for aTLS connections.",
             "type": "string",
-            "examples": ["azure-sev-snp", "azure-trusted-launch", "gcp-sev-es"]
+            "examples": [
+                "azure-sev-snp",
+                "azure-trusted-launch",
+                "gcp-sev-es"
+            ]
         }
     },
     "required": [
         "image",
-        "loadBalancerIP",
         "attestationVariant"
     ],
     "title": "Values",
diff --git a/cli/internal/helm/overrides.go b/cli/internal/helm/overrides.go
index 95e1739d725..2b0872ebd0c 100644
--- a/cli/internal/helm/overrides.go
+++ b/cli/internal/helm/overrides.go
@@ -62,7 +62,6 @@ func extraConstellationServicesValues(
 	}
 	extraVals["verification-service"] = map[string]any{
 		"attestationVariant": cfg.GetAttestationConfig().GetVariant().String(),
-		"loadBalancerIP":     output.ClusterEndpoint,
 	}
 	extraVals["konnectivity"] = map[string]any{
 		"loadBalancerIP": output.ClusterEndpoint,