fix: simplyfy redis, and run staging in standalone mode

applications/redis.yaml

@@ -9,10 +9,8 @@ spec:
       elements:
       - cluster: https://kubernetes.default.svc
         env: prod
-        hostname: redis.srv.oceanbox.io
       - cluster: https://kubernetes.default.svc
         env: staging
-        hostname: redis.beta.oceanbox.io
   template:
     metadata:
       name: '{{ env }}-redis'
@@ -22,25 +20,13 @@ spec:
         server: https://kubernetes.default.svc
         namespace: redis
       sources:
-        # - repoURL: https://charts.bitnami.com/bitnami
+        - repoURL: https://charts.bitnami.com/bitnami
-        #   targetRevision: 18.9.1
+          targetRevision: 19.5.2
-        #   chart: redis
+          chart: redis
-        #   helm:
+          helm:
-        #     valueFiles:
+            valueFiles:
-        #       - $values/redis/values.yaml
+              - $values/redis/values-{{ env }}.yaml
-        # - repoURL: https://gitlab.com/oceanbox/manifests.git
-        #   targetRevision: HEAD
-        #   path: kustomizations/redis/{{ env }}
-        #   ref: values
         - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: main
+          targetRevision: HEAD
           path: kustomizations/redis
-          plugin:
+          ref: values
-            name: kustomize-helm-with-rewrite
-            parameters:
-            - name: env
-              string: '{{ env }}'
-            - name: hostname
-              string: '{{ hostname }}'
-            - name: chart
-              string: bitnami/redis

kustomizations/redis/base/kustomization.yaml

@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- _manifest.yaml

kustomizations/redis/chart

@@ -1 +0,0 @@
-bitnami/redis

kustomizations/redis/prod/kustomization.yaml

@@ -1,5 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- nodeport.yaml
-- ../base

kustomizations/redis/prod/nodeport.yaml

@@ -1,17 +0,0 @@
-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

kustomizations/redis/staging/kustomization.yaml

@@ -1,3 +0,0 @@
-resources:
-- nodeport.yaml
-- ../base

kustomizations/redis/staging/nodeport.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: staging-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

kustomizations/redis/values-prod.yaml

@@ -1,5 +1,13 @@
-replica:
+architecture: replication
-  replicaCount: 2
+
 auth:
+  enabled: true
+  sentinel: true
+  password: ""
+  usePasswordFiles: false
+  existingSecretPasswordKey: ""
   existingSecret: prod-redis
 
+service:
+  nodePorts:
+    redis: 30379

kustomizations/redis/values-staging.yaml

@@ -1,5 +1,17 @@
+architechture: standalone
+
 replica:
-  replicaCount: 2
+  replicaCount: 1
+
 auth:
+  enabled: true
+  sentinel: true
+  password: ""
+  usePasswordFiles: false
+  existingSecretPasswordKey: ""
   existingSecret: staging-redis
 
+service:
+  nodePorts:
+    redis: 31379
+

kustomizations/redis/values.yaml

@@ -1,9 +0,0 @@
-architecture: replication
-auth:
-  enabled: true
-  sentinel: true
-  password: ""
-  existingSecret: ""
-  existingSecretPasswordKey: ""
-  usePasswordFiles: false
-