update folder structure

apps/kafka.yml

@@ -1,20 +1,18 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: kafka-demo
+  name: kafka-cluster
   namespace: argocd
 spec:
   project: default
   source:
-    repoURL: https://gitea.vhn-demo.duckdns.org/hoang/devops-infa.git
+    repoURL: https://gitea.vhn-demo.duckdns.org/devops-infra.git
     targetRevision: HEAD
-    path: kafka-demo
+    path: manifests/kafka
   destination:
     server: https://kubernetes.default.svc
     namespace: kafka
   syncPolicy:
     automated:
       prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+      selfHeal: true

apps/logging.yml

@@ -1,23 +1,22 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: monitoring-logging
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: https://grafana.github.io/helm-charts
-    chart: loki-stack
-    targetRevision: 2.9.10
-    helm:
-      valueFiles:
-        - ../../monitoring-logging/values.yaml
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: monitoring
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+# apps/logging.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: logging
+  namespace: argocd
+spec:
+  source:
+    repoURL: https://grafana.github.io/helm-charts
+    chart: loki-stack
+    targetRevision: 2.10.0
+    helm:
+      values: |
+        promtail:
+          enabled: true
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: logging
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true

apps/monitoring.yml

@@ -1,23 +1,22 @@
+# apps/monitoring.yaml
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: prometheus
+  name: monitoring
   namespace: argocd
 spec:
-  project: default
   source:
     repoURL: https://prometheus-community.github.io/helm-charts
     chart: kube-prometheus-stack
-    targetRevision: 58.2.0
+    targetRevision: 58.0.0
     helm:
-      valueFiles:
-        - ../../prometheus/values.yaml
+      values: |
+        grafana:
+          adminPassword: admin
   destination:
     server: https://kubernetes.default.svc
     namespace: monitoring
   syncPolicy:
     automated:
       prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+      selfHeal: true

apps/strimzi-operator.yml

@@ -0,0 +1,22 @@
+# apps/strimzi-operator.yaml
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: strimzi-operator
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://strimzi.io/charts/
+    chart: strimzi-kafka-operator
+    targetRevision: 0.39.0
+    helm:
+      values: |
+        watchAnyNamespace: true
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: kafka
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true

argocd/strimzi-operator-app.yml

@@ -1,23 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: strimzi-operator
-  namespace: argocd
-spec:
-  project: default
-  source:
-    repoURL: https://github.com/strimzi/strimzi-kafka-operator
-    targetRevision: 0.50.1
-    path: helm-charts/helm3/strimzi-kafka-operator
-    helm:
-      valueFiles:
-        - values.yaml
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: strimzi-operator
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true

kafka-demo/kafka-demo.yml

@@ -1,21 +0,0 @@
-apiVersion: kafka.strimzi.io/v1beta2
-kind: Kafka
-metadata:
-  name: kafka-demo
-spec:
-  kafka:
-    replicas: 1
-    listeners:
-      - name: plain
-        port: 9092
-        type: internal
-        tls: false
-    storage:
-      type: ephemeral
-  zookeeper:
-    replicas: 1
-    storage:
-      type: ephemeral
-  entityOperator:
-    topicOperator: {}
-    userOperator: {}

kafka/kafka.yml

@@ -0,0 +1,30 @@
+# manifests/kafka/kafka.yaml
+apiVersion: kafka.strimzi.io/v1beta2
+kind: Kafka
+metadata:
+  name: my-cluster
+  namespace: kafka
+spec:
+  kafka:
+    version: 3.7.0
+    replicas: 3
+    listeners:
+      - name: plain
+        port: 9092
+        type: internal
+        tls: false
+    storage:
+      type: ephemeral
+    metricsConfig:
+      type: jmxPrometheusExporter
+      valueFrom:
+        configMapKeyRef:
+          name: kafka-metrics
+          key: kafka-metrics-config.yml
+  zookeeper:
+    replicas: 3
+    storage:
+      type: ephemeral
+  entityOperator:
+    topicOperator: {}
+    userOperator: {}

kafka/namespace.yml

@@ -0,0 +1,5 @@
+# manifests/kafka/namespace.yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kafka

logging/namespace.yml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: logging

monitoring/namespace.yml

@@ -0,0 +1,5 @@
+# manifests/monitoring/namespace.yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: monitoring

prometheus/values.yml

@@ -1,6 +0,0 @@
-defaultRules:
-  create: true
-
-prometheus:
-  prometheusSpec:
-    retention: 12h

strimzi-operator/values.yml

@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: strimzi-operator
-
-resources:
-  - strimzi-cluster-operator.yaml