diff --git a/README.md b/README.md index cbd1f92..d14c635 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ docker run -v $(pwd)/config.yaml:/application/config.yaml \ А также установить Python-библиотеки из списка "requirements.txt" ```shell -./kube-forge -c config.yaml -d . apply +kube-forge -c config.yaml -d . apply ``` ## Параметры: diff --git a/cmd/main/main.go b/cmd/main/main.go index e204525..649f1fb 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -17,7 +17,6 @@ func main() { flag.StringVar(&configPath, "c", "/etc/kube-forge/config.yaml", "Path to config file") flag.StringVar(&workDir, "d", "/var/lib/kube-forge", "Path to kube-forge work dir") flag.BoolVar(&verbose, "v", false, "Enable verbose logging") - fmt.Println(verbose) flag.Parse() config := config.CreateConfig(configPath, workDir, password) config.Verbose = verbose diff --git a/internal/config/modules_observability.go b/internal/config/modules_observability.go index 44dffd2..bf7b112 100644 --- a/internal/config/modules_observability.go +++ b/internal/config/modules_observability.go @@ -149,8 +149,8 @@ type Visualization struct { Enabled bool `yaml:"enabled"` Grafana struct { Enabled bool `yaml:"enabled"` - Image string `yaml:"image" env-default:"grafana/grafana"` - Tag string `yaml:"tag" env-default:"10.4.1"` + Image string `yaml:"image" env-default:"harbor.kvazaric.ru/kube-forge/grafana"` + Tag string `yaml:"tag" env-default:"10.4.1-v2"` Expose struct { Type string `yaml:"type" env-default:"ingress"` Domain string `yaml:"domain" env-default:""` 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 43bff48..710c7cf 100644 --- a/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl +++ b/internal/resources/templates/helm-apps/releases/observability/observability.yml.tmpl @@ -245,6 +245,7 @@ {{- if and .Modules.Observability.Enabled .Modules.Observability.Logging.Enabled }} - name: Kube-loki type: loki + uid: P2895588539814C92 access: proxy url: http://loki:3100 editable: false @@ -288,7 +289,7 @@ exporters: [otlphttp] ingress: - {{- if eq .Modules.Observability.Visualization.Grafana.Expose.Type "ingress" }} + {{- if and .Modules.Observability.Visualization.Grafana.Enabled (eq .Modules.Observability.Visualization.Grafana.Expose.Type "ingress") }} enabled: true {{- else }} enabled: false diff --git a/kubespray/inventory/group_vars/k8s_cluster/addons.yml b/kubespray/inventory/group_vars/k8s_cluster/addons.yml index 173cea0..0afd6c2 100644 --- a/kubespray/inventory/group_vars/k8s_cluster/addons.yml +++ b/kubespray/inventory/group_vars/k8s_cluster/addons.yml @@ -4039,8 +4039,8 @@ releases: domain: &grafanaDomain grafana.disk.lt.t1.cloud path: / image: - repository: grafana/grafana - tag: 10.4.1 + repository: harbor.kvazaric.ru/kube-forge/grafana + tag: 10.4.1-v2 pullPolicy: IfNotPresent storageClassName: "local-path" @@ -4066,6 +4066,7 @@ releases: additionalDatasources: - name: Kube-loki type: loki + uid: P2895588539814C92 access: proxy url: http://loki:3100 editable: false @@ -4658,7 +4659,7 @@ releases: server.insecure: true secret: - argocdServerAdminPassword: $2a$10$eb0YB2bJ/B9XvAOACyvWGOUMDfyOO.Jfej8DyA.7MhzzwhopgkVFq + argocdServerAdminPassword: $2a$10$eNxOwjtN3LQI43LN955F5uaOw3/i1pIp7xes.krK0GDZiDv1SMfNi repositories: # add default helm-repository from harbor @@ -4666,7 +4667,7 @@ releases: cm: create: true - url: "https://cicd.disk.lt.t1.cloud" + url: "https://argocd.disk.lt.t1.cloud" accounts.developer: login accounts.guest: login @@ -5384,7 +5385,7 @@ releases: release_state: "present" values: services: - - domain: cicd.disk.lt.t1.cloud + - domain: argocd.disk.lt.t1.cloud path: / address: argo-cd-argocd-server port: 80