From 81fee6f9a7e4d52935a154786b6c29cfe11906bd Mon Sep 17 00:00:00 2001
From: area363 <kidonseo@gmail.com>
Date: Wed, 29 Nov 2023 19:46:20 +0900
Subject: [PATCH] clean up annotation

---
 charts/all-in-one/templates/service.yaml      | 44 -------------------
 charts/remote-headless/templates/service.yaml |  1 -
 2 files changed, 45 deletions(-)

diff --git a/charts/all-in-one/templates/service.yaml b/charts/all-in-one/templates/service.yaml
index 1b6684203..0179921c2 100644
--- a/charts/all-in-one/templates/service.yaml
+++ b/charts/all-in-one/templates/service.yaml
@@ -10,9 +10,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -54,9 +51,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -190,9 +184,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -226,9 +217,6 @@ metadata:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
@@ -269,9 +257,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -311,9 +296,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -349,11 +331,9 @@ metadata:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-    {{- if ne $.Values.global.networkType "Main" }}
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/4312c1a7-51c4-4442-8ae4-c8f3f2bce4f0
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=world-boss-service
@@ -449,9 +429,6 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-type: "external"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/4312c1a7-51c4-4442-8ae4-c8f3f2bce4f0
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
@@ -485,9 +462,6 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-type: "external"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=market-db
 spec:
   ports:
@@ -512,9 +486,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -555,9 +526,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -597,9 +565,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -629,9 +594,6 @@ metadata:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
     service.beta.kubernetes.io/aws-load-balancer-type: external
@@ -665,9 +627,6 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-type: "external"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/4312c1a7-51c4-4442-8ae4-c8f3f2bce4f0
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
@@ -701,9 +660,6 @@ metadata:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-type: "external"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
-    {{- if eq $.Values.global.networkType "Main" }}
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
-    {{- end }}
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=patrol-reward-db
 spec:
   ports:
diff --git a/charts/remote-headless/templates/service.yaml b/charts/remote-headless/templates/service.yaml
index 9b9fcd242..00e702685 100644
--- a/charts/remote-headless/templates/service.yaml
+++ b/charts/remote-headless/templates/service.yaml
@@ -11,7 +11,6 @@ metadata:
     app.kubernetes.io/instance: {{ default "remote-headless" $.Values.nameOverwrite }}
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
-    service.beta.kubernetes.io/aws-load-balancer-type: "external"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-2:319679068466:certificate/2481ac9e-2037-4331-9234-4b3f86d50ad3
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"