fix(aws-eks-tutorial): use alb ingress instead

nuonco · Mar 2, 2024 · a79d3f9 · a79d3f9
1 parent d932300
commit a79d3f9
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 97 deletions.
diff --git a/aws-eks-tutorial/components/certificate/main.tf b/aws-eks-tutorial/components/certificate/main.tf
@@ -4,5 +4,6 @@ module "certificate" {
 
   domain_name         = var.domain_name
   zone_id             = var.zone_id
+  validation_method   = "DNS"
   wait_for_validation = false
 }
diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_alb.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_alb.tpl
@@ -0,0 +1,47 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "common.fullname" . }}-api
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "common.apiLabels" . | nindent 4 }}
+  annotations:
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: ip
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP":80}]'
+    {{- /*
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
+    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.api.nlbs.public_domain_certificate }}
+    alb.ingress.kubernetes.io/aws-load-balancer-ssl-ports: https
+    */}}
+    alb.ingress.kubernetes.io/healthcheck-path: /livez
+    external-dns.alpha.kubernetes.io/hostname: {{ .Values.api.nlbs.public_domain }}
+spec:
+  ingressClassName: alb
+  rules:
+    - http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ include "common.fullname" . }}-api
+                port:
+                  name: http
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "common.fullname" . }}-api
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "common.apiLabels" . | nindent 4 }}
+spec:
+  selector:
+    {{- include "common.apiSelectorLabels" . | nindent 4 }}
+  type: ClusterIP
+  ports:
+    - name: http
+      port: 8080
+      targetPort: http
diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_certificate.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_certificate.tpl
diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_deployment.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_deployment.tpl
@@ -22,10 +22,16 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           ports:
             - name: http
-              containerPort: 8080
-              hostPort: 8080
-          readinessProbe: null
-          livenessProbe: null
+              containerPort: {{ .Values.api.port }}
+              protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.api.readiness_probe}}
+              port: http
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.api.liveness_probe}}
+              port: http
           resources:
             limits:
               cpu: 100m

diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_ingress.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_ingress.tpl
diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_nlbs.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_nlbs.tpl
diff --git a/aws-eks-tutorial/components/helm-chart/templates/api_service.tpl b/aws-eks-tutorial/components/helm-chart/templates/api_service.tpl
diff --git a/aws-eks-tutorial/components/helm-chart/values.yaml b/aws-eks-tutorial/components/helm-chart/values.yaml
@@ -15,13 +15,12 @@ serviceAccount:
 
 api:
   port: 8080
-
-  ingresses:
-    public_domain: api.INSTALL_PUBLIC_DOMAIN
+  readinessProbe: /readyz
+  livenessProbe: /livez
 
   nlbs:
     public_domain: nlb.INSTALL_PUBLIC_DOMAIN
-    public_domain_certificate: nbl.PUBLIC_DOMAIN_CERTIFICATE
+    public_domain_certificate: nlb.PUBLIC_DOMAIN_CERTIFICATE
 
   autoscaling:
     minReplicas: 1