major: cleanup before merge back to

2025-02-07 07:27:39 +01:00
parent e3b1ef76da
commit 253ed4eeba
21 changed files with 80 additions and 670 deletions
@@ -1,39 +1,28 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
-  name: redis
+  name: prod-redis
  namespace: argocd
 spec:
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-      - cluster: https://kubernetes.default.svc
-        env: staging
-  template:
-    metadata:
-      name: '{{ env }}-redis'
-    spec:
-      project: aux
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: redis
-      sources:
-        - repoURL: https://charts.bitnami.com/bitnami
-          targetRevision: 19.5.2
-          chart: redis
-          helm:
-            valueFiles:
-              - $values/values/redis/values-{{ env }}.yaml
-        - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: HEAD
-          ref: values
-        - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: main
-          path: values/redis/{{ env }}
-      ignoreDifferences:
-        - group: apps
-          kind: StatefulSet
-          jqPathExpressions:
-            - '.spec.template.spec.containers[].resources.limits.cpu'
+  project: aux
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: redis
+  sources:
+    - repoURL: https://charts.bitnami.com/bitnami
+      targetRevision: 19.5.2
+      chart: redis
+      helm:
+        valueFiles:
+          - $values/values/redis/values-prod.yaml
+    - repoURL: https://gitlab.com/oceanbox/manifests.git
+      targetRevision: HEAD
+      ref: values
+    - repoURL: https://gitlab.com/oceanbox/manifests.git
+      targetRevision: main
+      path: values/redis/prod
+  ignoreDifferences:
+    - group: apps
+      kind: StatefulSet
+      jqPathExpressions:
+        - '.spec.template.spec.containers[].resources.limits.cpu'