migrate to eks

tk-hap · Apr 10, 2024 · 1d9536d · 1d9536d
1 parent 0832fa9
commit 1d9536d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 6 deletions.
diff --git a/helm/redis/values.yaml b/helm/redis/values.yaml
@@ -1094,7 +1094,7 @@ sentinel:
   ## IMPORTANT: this will disable the master and replicas services and
   ## create a single Redis&reg; service exposing both the Redis and Sentinel ports
   ##
-  enabled: true
+  enabled: false
   ## Bitnami Redis&reg; Sentinel image version
   ## ref: https://hub.docker.com/r/bitnami/redis-sentinel/tags/
   ## @param sentinel.image.registry [default: REGISTRY_NAME] Redis&reg; Sentinel image registry

diff --git a/helm/vid-recipe-gen-chart/templates/configmap.yaml b/helm/vid-recipe-gen-chart/templates/configmap.yaml
@@ -3,8 +3,8 @@ kind: ConfigMap
 metadata:
     name: {{ .Release.Name }}-vid-recipe-gen-flask-config
 data:
-    REDISHOST: {{ .Values.config.redisHost }}
-    REDISPORT: {{ .Values.config.redisPort | quote}}
+    REDIS_HOST: {{ .Values.config.redisHost }}
+    REDIS_PORT: {{ .Values.config.redisPort | quote}}
     REQUEST_LIMIT: {{ .Values.config.requestLimit | quote }}
     REQUEST_TIMEOUT_SECS: {{ .Values.config.requestTimeoutSecs | quote }}
     MAX_VIDEO_LENGTH: {{ .Values.config.maxVideoLength }}

diff --git a/helm/vid-recipe-gen-chart/templates/ingress.yaml b/helm/vid-recipe-gen-chart/templates/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-vid-recipe-gen-flask
+  annotations:
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: ip
+    alb.ingress.kubernetes.io/healthcheck-path: /
+    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.ingress.certificateArn  }}
+spec:
+  ingressClassName: alb
+  rules:
+    - http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ .Release.Name }}-vid-recipe-gen-flask
+                port:
+                  number: 443
diff --git a/helm/vid-recipe-gen-chart/templates/service.yaml b/helm/vid-recipe-gen-chart/templates/service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-vid-recipe-gen-flask
+spec:
+  selector:
+    app: vid-recipe-gen-flask
+  ports:
+    - protocol: TCP
+      port: 443
+      targetPort: 8080
diff --git a/helm/vid-recipe-gen-chart/values.yaml b/helm/vid-recipe-gen-chart/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/tk-hap/video-recipe-gen-flask
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "148ac16ecba809972c933a2e6827dae7713ed83b"
+  tag: "9e5619c197711159fdc6b5210c0cb652624ca2cb"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -20,8 +20,8 @@ service:
   targetPort: 8080
 
 config:
-  redisHost : "redis-sentinel.default.svc.cluster.local" #K8s Service
-  redisPort : 26379 #Redis Sentinel
+  redisHost : "redis-master.tk.svc.cluster.local" #K8s Service
+  redisPort : 6379
   requestLimit : 5
   requestTimeoutSecs : 86400
   maxVideoLength: "PT45M"
@@ -31,3 +31,5 @@ apiKeys:
   openAiApiKey: ""
   youtubeApiKey: ""
 
+ingress:
+  certificateArn: "arn:aws:acm:ap-southeast-2:223061654492:certificate/dd6bfe6f-2002-49cc-a8e0-fddb57b18b6c"