typo: correct service type

filipeforattini · Jul 7, 2022 · a7325fd · a7325fd
1 parent 091582d
commit a7325fd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/deploy/as-k8s/service.schema.yml b/deploy/as-k8s/service.schema.yml
@@ -16,7 +16,8 @@
 #@ def defaultService():
   enable: true
   name: svc
-  type: simple
+  type: ClusterIP
+  controller: null
 
   #@schema/type any=True
   labels: null
@@ -35,7 +36,7 @@
     domain: acme.io
 
   #! types specifics
-  nlb:
+  aws:
     internal: true
     sslCert: secret
     nodeTabels: ""

diff --git a/deploy/as-k8s/service/4-service.yml b/deploy/as-k8s/service/4-service.yml
@@ -21,29 +21,35 @@ metadata:
   #@    })
   #@  end
 
-  #@  if data.values.service.type == "nlb":
+  #@  if data.values.service.controller == "aws":
   #@    serviceAnnotations.update({
   #@      "service.beta.kubernetes.io/aws-load-balancer-type": "nlb",
-  #@      "service.beta.kubernetes.io/aws-load-balancer-internal": "{}".format(data.values.service.nlb.internal).lower(),
+  #@      "service.beta.kubernetes.io/aws-load-balancer-internal": "{}".format(data.values.service.aws.internal).lower(),
   #@      "service.beta.kubernetes.io/aws-load-balancer-backend-protocol": "http",
   #@      "service.beta.kubernetes.io/aws-load-balancer-connection-draining-enabled": "true",
   #@      "service.beta.kubernetes.io/aws-load-balancer-connection-draining-timeout": "60",
   #@      "service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled": "true",
-  #@      "service.beta.kubernetes.io/aws-load-balancer-ssl-cert": data.values.service.nlb.sslCert,
+  #@      "service.beta.kubernetes.io/aws-load-balancer-ssl-cert": data.values.service.aws.sslCert,
   #@      "service.beta.kubernetes.io/aws-load-balancer-ssl-ports": "443",
-  #@      "service.beta.kubernetes.io/aws-load-balancer-target-node-labels": data.values.service.nlb.nodeTabels,
+  #@      "service.beta.kubernetes.io/aws-load-balancer-target-node-labels": data.values.service.aws.nodeTabels,
   #@    })
   #@  end
   annotations: #@ serviceAnnotations
 
 spec:
-  #@ if data.values.service.selector.overwrite:
+  #@  if data.values.service.controller != None:
+  type: LoadBalancer
+  #@  else:
+  type: #@ data.values.service.type
+  #@  end
+
+  #@  if data.values.service.selector.overwrite:
   selector: #@ data.values.service.selector.labels
-  #@ else:
-  #@ serviceMatchLabels = {}
-  #@ serviceMatchLabels.update({ "pipe/selector": data.values.repository + "." + data.values.deployment.name })
+  #@  else:
+  #@    serviceMatchLabels = {}
+  #@    serviceMatchLabels.update({ "pipe/selector": data.values.repository + "." + data.values.deployment.name })
   selector: #@ serviceMatchLabels
-  #@ end
+  #@  end
 
   #@ servicePorts = []
   #@ servicePorts.extend(data.values.service.ports)

diff --git a/test/assets/svc-service-nlb.yml → test/assets/svc-service-aws.yml b/test/assets/svc-service-nlb.yml → test/assets/svc-service-aws.yml
@@ -7,14 +7,14 @@ env:
     value: America/Sao_Paulo
 
 service:
-  type: nlb
+  controller: aws
   annotations:
     A: "1"
     B: "2"
     C: "3"
   externalDns:
     enable: true
     domain: acme.io
-  nlb:
+  aws:
     internal: true
     sslCert: secret
diff --git a/test/cases/svc-service.sh b/test/cases/svc-service.sh
@@ -8,5 +8,5 @@ ytt \
 ytt \
   -f $DIR_SRC/service.schema.yml \
   -f $DIR_SRC/service \
-  -f $DIR_ASSETS/svc-service-nlb.yml \
-    > $DIR_RESULTS/src-service-2-nlb.yml
+  -f $DIR_ASSETS/svc-service-aws.yml \
+    > $DIR_RESULTS/src-service-2-aws.yml