From 26b326dd4f38a3086cc4a145066601d822f16297 Mon Sep 17 00:00:00 2001 From: George Stykalin Date: Tue, 14 May 2024 17:15:10 +0300 Subject: [PATCH] add k8s-admin config copy and add requirements --- cmd/main/main.go | 1 - internal/kubespray/cluster.go | 4 +++- requirements.txt | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 requirements.txt diff --git a/cmd/main/main.go b/cmd/main/main.go index 5c13e64..c3350ff 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -32,7 +32,6 @@ func main() { switch cmd { case "apply": kubespray.InstallCluster("") - kubespray.CopyK8SAdminConfig("k8s-admin.conf") return case "apply-modules": kubespray.InstallCluster("helm-apps") diff --git a/internal/kubespray/cluster.go b/internal/kubespray/cluster.go index 876d834..33917e5 100644 --- a/internal/kubespray/cluster.go +++ b/internal/kubespray/cluster.go @@ -8,7 +8,7 @@ import ( func InstallCluster(tags string) { runPlaybook("kubespray/project/cluster.yml", tags) - + CopyK8SAdminConfig("k8s-admin.conf") config := config.GetConfig() if config.Modules.SecretsStorage.Enabled { fmt.Println("## Additional Vault Configuration") @@ -20,8 +20,10 @@ func InstallCluster(tags string) { func UpgradeCluster(tags string) { runPlaybook("kubespray/project/upgrade_cluster.yml", tags) + CopyK8SAdminConfig("k8s-admin.conf") } func ScaleCluster() { runPlaybook("kubespray/project/scale.yml", "") + CopyK8SAdminConfig("k8s-admin.conf") } diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e3faa0a --- /dev/null +++ b/requirements.txt @@ -0,0 +1,10 @@ +ansible==9.5.1 +cryptography==41.0.4 +jinja2==3.1.4 +jmespath==1.0.1 +MarkupSafe==2.1.5 +netaddr==1.2.1 +pbr==5.11.1 +ruamel.yaml==0.18.6 +ruamel.yaml.clib==0.2.8 +jsonschema==4.22.0 \ No newline at end of file