update

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")
 }

examples/argo-cd-example.yaml

@@ -0,0 +1 @@
+https://github.com/argoproj/argocd-example-apps/tree/master/guestbook

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"`

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:

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 }}"

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