From 896e27fc1f776d95d7548b445ec45dfacf548f51 Mon Sep 17 00:00:00 2001 From: George Stykalin Date: Fri, 26 Apr 2024 00:12:54 +0300 Subject: [PATCH] update runPlaybook function --- kubespray/inventory/group_vars/k8s_cluster/addons.yml | 2 +- pkg/kubespray/cluster.go | 9 +++------ pkg/kubespray/utility.go | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kubespray/inventory/group_vars/k8s_cluster/addons.yml b/kubespray/inventory/group_vars/k8s_cluster/addons.yml index 4d72914..92655c1 100644 --- a/kubespray/inventory/group_vars/k8s_cluster/addons.yml +++ b/kubespray/inventory/group_vars/k8s_cluster/addons.yml @@ -1961,7 +1961,7 @@ releases: server.insecure: true secret: - argocdServerAdminPassword: $2a$10$vyI/s19oGdrz9rtPVKsZeuXIdPhQQcUzNcn/soL160xBFmvraA3Za + argocdServerAdminPassword: $2a$10$uVEAEmc8bmtQYsa3206a7OkI5oHkNWluS9s5szXsNUsgmKvY2jGZy repositories: # add default helm-repository from harbor diff --git a/pkg/kubespray/cluster.go b/pkg/kubespray/cluster.go index 295862e..a836e3f 100644 --- a/pkg/kubespray/cluster.go +++ b/pkg/kubespray/cluster.go @@ -1,16 +1,13 @@ package kubespray func InstallCluster(tags string) { - ansiblePlaybookOptions := getPlaybookParameters(tags) - runPlaybook("kubespray/project/cluster.yml", ansiblePlaybookOptions) + runPlaybook("kubespray/project/cluster.yml", tags) } func UpgradeCluster(tags string) { - ansiblePlaybookOptions := getPlaybookParameters(tags) - runPlaybook("kubespray/project/upgrade_cluster.yml", ansiblePlaybookOptions) + runPlaybook("kubespray/project/upgrade_cluster.yml", tags) } func ResetCluster() { - ansiblePlaybookOptions := getPlaybookParameters("reset") - runPlaybook("kubespray/project/reset.yml", ansiblePlaybookOptions) + runPlaybook("kubespray/project/reset.yml", "reset") } diff --git a/pkg/kubespray/utility.go b/pkg/kubespray/utility.go index d93187e..1ddc969 100644 --- a/pkg/kubespray/utility.go +++ b/pkg/kubespray/utility.go @@ -55,7 +55,8 @@ func CopyK8SAdminConfig(pathInDataDir string) { } } -func runPlaybook(playbookPath string, playbookOptions playbook.AnsiblePlaybookOptions) { +func runPlaybook(playbookPath string, tags string) { + playbookOptions := getPlaybookParameters(tags) playbookCmd := playbook.NewAnsiblePlaybookCmd( playbook.WithPlaybooks(playbookPath), playbook.WithPlaybookOptions(&playbookOptions),