From 502552be32d89b5c46e23b50f9ea72bc83e8693b Mon Sep 17 00:00:00 2001
From: George Stykalin <gstykalin@mail.ru>
Date: Sun, 12 May 2024 18:20:13 +0300
Subject: [PATCH] update

---
 cmd/main/main.go                                            | 6 ++++++
 examples/argo-cd-example.yaml                               | 1 +
 internal/config/modules_cicd.go                             | 2 +-
 .../templates/helm-apps/releases/cicd/argo-cd.yml.tmpl      | 1 -
 .../helm-apps/releases/observability/observability.yml.tmpl | 3 ++-
 kubespray/inventory/group_vars/k8s_cluster/addons.yml       | 6 +++---
 6 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 examples/argo-cd-example.yaml

diff --git a/cmd/main/main.go b/cmd/main/main.go
index bd886b7..5c13e64 100644
--- a/cmd/main/main.go
+++ b/cmd/main/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"kube-forge/internal/config"
 	"kube-forge/internal/kubespray"
 	"kube-forge/internal/templates"
@@ -32,12 +33,17 @@ func main() {
 		case "apply":
 			kubespray.InstallCluster("")
 			kubespray.CopyK8SAdminConfig("k8s-admin.conf")
+			return
 		case "apply-modules":
 			kubespray.InstallCluster("helm-apps")
+			return
 		case "upgrade":
 			kubespray.UpgradeCluster("")
+			return
 		case "scale":
 			kubespray.ScaleCluster()
+			return
 		}
 	}
+	fmt.Println("No such command\nAvailable commands: apply, apply-modules, upgrade, scale")
 }
diff --git a/examples/argo-cd-example.yaml b/examples/argo-cd-example.yaml
new file mode 100644
index 0000000..1b95d1d
--- /dev/null
+++ b/examples/argo-cd-example.yaml
@@ -0,0 +1 @@
+https://github.com/argoproj/argocd-example-apps/tree/master/guestbook
diff --git a/internal/config/modules_cicd.go b/internal/config/modules_cicd.go
index 42d9599..6bb2a8c 100644
--- a/internal/config/modules_cicd.go
+++ b/internal/config/modules_cicd.go
@@ -4,7 +4,7 @@ type Cicd struct {
 	Enabled bool `yaml:"enabled"`
 	ArgoCd  struct {
 		ChartRef      string `yaml:"chart_ref" env-default:"kube-forge/argo-cd"`
-		ChartVersion  string `yaml:"chart_version" env-default:"6.7.12"`
+		ChartVersion  string `yaml:"chart_version" env-default:"5.46.7"`
 		AdminPassword string
 		Ha            struct {
 			Enabled     bool `yaml:"enabled"`
diff --git a/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl b/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
index 3c7bc65..4ea1390 100644
--- a/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/cicd/argo-cd.yml.tmpl
@@ -75,7 +75,6 @@
       replicas: 2
       {{- end }}
       {{- end }}
-
       metrics:
         enabled: {{ and .Modules.Observability.Enabled .Modules.Observability.Monitoring.Enabled }}
         serviceMonitor:
diff --git a/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl b/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
index 350cc2d..e37042b 100644
--- a/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
+++ b/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl
@@ -33,6 +33,7 @@
       scrapeInterval: {{ .Modules.Observability.Monitoring.Prometheus.ScrapeInterval }}
       retention: {{ .Modules.Observability.Monitoring.Prometheus.Persistence.Retention }}
       # serviceNodePort: 30008
+
       additionalConfigs: |
         - job_name: "kubelet"
           scheme: https
@@ -307,7 +308,7 @@
     containerRuntime: {{ .Orchestrator.ContainerEngine.Type }}
 
     fluentbit:
-      enable: {{ .Modules.Observability.Logging.Enabled }}
+      enable: {{ and .Modules.Observability.Enabled .Modules.Observability.Logging.Enabled }}
       serviceMonitor: true
       image:
         repository: "{{ .Modules.Observability.Logging.FluentBit.Image }}"
diff --git a/kubespray/inventory/group_vars/k8s_cluster/addons.yml b/kubespray/inventory/group_vars/k8s_cluster/addons.yml
index 24659f5..d1fb88d 100644
--- a/kubespray/inventory/group_vars/k8s_cluster/addons.yml
+++ b/kubespray/inventory/group_vars/k8s_cluster/addons.yml
@@ -3404,6 +3404,7 @@ releases:
         scrapeInterval: 15s
         retention: 7d
         # serviceNodePort: 30008
+  
         additionalConfigs: |
           - job_name: "kubelet"
             scheme: https
@@ -4154,7 +4155,7 @@ releases:
     namespace: cicd
     create_namespace: true
     chart_ref: kube-forge/argo-cd
-    chart_version: 6.7.12
+    chart_version: 5.46.7
     release_state: "present"
     values:
       crds:
@@ -4196,7 +4197,6 @@ releases:
             enabled: false
   
       repoServer:
-  
         metrics:
           enabled: true
           serviceMonitor:
@@ -4213,7 +4213,7 @@ releases:
           server.insecure: true
   
         secret:
-          argocdServerAdminPassword: $2a$10$728kdD1XZaJxi.H4mo1Eeen2YjKtdIjG736JjsTtFmeZ7vXGVSvO.
+          argocdServerAdminPassword: $2a$10$A6C0LMJpyH6Jx1CF570MxuCc/CYRauqjv3Z.31IcwEnf3h1E02QnG
   
         repositories:
           # add default helm-repository from harbor