From 4b7337677bad0824820ba6d981f11c04074ea2a4 Mon Sep 17 00:00:00 2001
From: Jonas Juselius <jonas.juselius@itpartner.no>
Date: Mon, 10 Jun 2024 10:26:11 +0200
Subject: [PATCH] fix: fix redis nodeport (take 2)

---
 applications/redis.yaml                    |  6 ++++--
 kustomizations/redis/nodeport-prod.yaml    | 17 +++++++++++++++++
 kustomizations/redis/nodeport-staging.yaml | 17 +++++++++++++++++
 kustomizations/redis/values-prod.yaml      |  4 ----
 kustomizations/redis/values-staging.yaml   |  5 -----
 5 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 kustomizations/redis/nodeport-prod.yaml
 create mode 100644 kustomizations/redis/nodeport-staging.yaml

diff --git a/applications/redis.yaml b/applications/redis.yaml
index 92a84cba..98463b96 100644
--- a/applications/redis.yaml
+++ b/applications/redis.yaml
@@ -25,8 +25,10 @@ spec:
           chart: redis
           helm:
             valueFiles:
-              - $values/redis/values-{{ env }}.yaml
+              - $values/kustomizations/redis/values-{{ env }}.yaml
         - repoURL: https://gitlab.com/oceanbox/manifests.git
           targetRevision: HEAD
-          path: kustomizations/redis
           ref: values
+        - repoURL: https://gitlab.com/oceanbox/manifests.git
+          targetRevision: main
+          path: kustomizations/redis/nodeport-{{ env }}.yaml
diff --git a/kustomizations/redis/nodeport-prod.yaml b/kustomizations/redis/nodeport-prod.yaml
new file mode 100644
index 00000000..e65efac6
--- /dev/null
+++ b/kustomizations/redis/nodeport-prod.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: prod-redis-nodeport
+spec:
+  externalTrafficPolicy: Cluster
+  ports:
+  - name: redis
+    nodePort: 30379
+    port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app.kubernetes.io/instance: prod-redis
+    app.kubernetes.io/name: redis
+  sessionAffinity: None
+  type: NodePort
diff --git a/kustomizations/redis/nodeport-staging.yaml b/kustomizations/redis/nodeport-staging.yaml
new file mode 100644
index 00000000..1708ca08
--- /dev/null
+++ b/kustomizations/redis/nodeport-staging.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: stagin-redis-nodeport
+spec:
+  externalTrafficPolicy: Cluster
+  ports:
+  - name: redis
+    nodePort: 31379
+    port: 6379
+    protocol: TCP
+    targetPort: 6379
+  selector:
+    app.kubernetes.io/instance: staging-redis
+    app.kubernetes.io/name: redis
+  sessionAffinity: None
+  type: NodePort
diff --git a/kustomizations/redis/values-prod.yaml b/kustomizations/redis/values-prod.yaml
index 691dbdfc..bd2ed081 100644
--- a/kustomizations/redis/values-prod.yaml
+++ b/kustomizations/redis/values-prod.yaml
@@ -8,7 +8,3 @@ auth:
   existingSecretPasswordKey: ""
   existingSecret: prod-redis
 
-master:
-  service:
-    nodePorts:
-      redis: 30379
diff --git a/kustomizations/redis/values-staging.yaml b/kustomizations/redis/values-staging.yaml
index 686c5b74..f58b8b77 100644
--- a/kustomizations/redis/values-staging.yaml
+++ b/kustomizations/redis/values-staging.yaml
@@ -11,8 +11,3 @@ auth:
   existingSecretPasswordKey: ""
   existingSecret: staging-redis
 
-master:
-  service:
-    nodePorts:
-      redis: 31379
-