diff --git a/ansible/inventories/kubernetes.yml b/ansible/inventories/kubernetes.yml index 173ce5a..c86d110 100644 --- a/ansible/inventories/kubernetes.yml +++ b/ansible/inventories/kubernetes.yml @@ -6,15 +6,15 @@ all: control_plane: hosts: controlplane: - ansible_host: 10.203.146.138 + ansible_host: 10.203.146.85 workers: hosts: node01: - ansible_host: 10.203.146.31 + ansible_host: 10.203.146.146 node02: - ansible_host: 10.203.146.165 + ansible_host: 10.203.146.50 node03: - ansible_host: 10.203.146.249 + ansible_host: 10.203.146.103 vars: ansible_user: ubuntu ansible_become: yes diff --git a/cli/cmd/provision/kubernetes/provision.go b/cli/cmd/provision/kubernetes/provision.go index 90fc40c..b34ca1d 100644 --- a/cli/cmd/provision/kubernetes/provision.go +++ b/cli/cmd/provision/kubernetes/provision.go @@ -208,19 +208,29 @@ func ProvisionInteractive() error { // runProvisionScript runs the actual Kubernetes provisioning func runProvisionScript(configPath string) error { - // Run the ansible playbook with custom variables + // Path to the shell script for Kubernetes provisioning + provisionScriptPath := "../../../scripts/provision-kubernetes.sh" + + // Check if script exists + if _, err := os.Stat(provisionScriptPath); os.IsNotExist(err) { + return fmt.Errorf("provision script does not exist: %s", provisionScriptPath) + } + + // Run the provision script + cmd := exec.Command(provisionScriptPath) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Stdin = os.Stdin + + // Execute the provision script which handles Multipass VM creation + if err := cmd.Run(); err != nil { + return fmt.Errorf("failed to run provision script: %w", err) + } + + // Continue with Ansible playbook inventory := "../../../ansible/inventories/kubernetes.yml" playbook := "../../../ansible/playbooks/kubernetes.yml" - // Check if files exist - if _, err := os.Stat(inventory); os.IsNotExist(err) { - return fmt.Errorf("inventory file does not exist: %s", inventory) - } - if _, err := os.Stat(playbook); os.IsNotExist(err) { - return fmt.Errorf("playbook file does not exist: %s", playbook) - } - - // Run ansible-playbook return ansible.RunPlaybook(playbook, inventory, []string{"-e", "@" + configPath}) }