diff --git a/README.md b/README.md index 89ccc2a..be2dd2e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - Create a username named "orangepi" with password "orangepi". -- Install sudo. +- Install `sudo`. - Allow the user "orangepi" to have access to sudo. - The user "orangepi" will be later deleted, so it's fine. diff --git a/inventory.yaml b/inventory.yaml index b6ea510..edb5476 100644 --- a/inventory.yaml +++ b/inventory.yaml @@ -9,9 +9,14 @@ slaves: hosts: - slave[03:03].filter.home: + slave[04:04].filter.home: vars: is_master: no + is_proxmox_vm: true +# setup_only: false initial_username: orangepi initial_password: orangepi delete_user_name: orangepi +all: + vars: + kubernetes_version: 1.32 \ No newline at end of file diff --git a/ksetup/playbook.yaml b/ksetup/playbook.yaml index 7932c87..b1f833f 100755 --- a/ksetup/playbook.yaml +++ b/ksetup/playbook.yaml @@ -14,6 +14,8 @@ ansible_password: "adminpassword" # Testing purposes ansible_become_password: "{{ ansible_password }}" # Testing purposes + # Kubernetes version + target_kubernetes_version: "{{ kubernetes_version }}" # Testing purposes # Actual vars set_hostname: "{{ ansible_host }}" @@ -34,6 +36,7 @@ - debug: var=_is_master - debug: var=_is_proxmox_vm - debug: var=_setup_only + - debug: var=target_kubernetes_version - name: Ping check ping: @@ -46,13 +49,13 @@ # If _is_master: init - name: init cluster import_tasks: tasks_master.yaml - when: _is_master and not setup_only + when: _is_master and not _setup_only become: true # else: join - name: join cluster import_tasks: tasks_slave.yaml - when: not _is_master and not setup_only + when: not _is_master and not _setup_only # Do other stuff - name: post setup diff --git a/ksetup/tasks_prepare_node.yaml b/ksetup/tasks_prepare_node.yaml index 9bd8083..268dd6c 100755 --- a/ksetup/tasks_prepare_node.yaml +++ b/ksetup/tasks_prepare_node.yaml @@ -92,13 +92,13 @@ # Kubeshit repo - name: Add Kubernetes GPG key apt_key: - url: https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key + url: "https://pkgs.k8s.io/core:/stable:/v{{ target_kubernetes_version }}/deb/Release.key" state: present - keyring: /etc/apt/keyrings/kubernetes-apt-keyring-1.29.gpg + keyring: "/etc/apt/keyrings/kubernetes-apt-keyring-{{ target_kubernetes_version }}.gpg" - name: Add Kubernetes APT repository apt_repository: - repo: deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring-1.29.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ / + repo: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring-{{ target_kubernetes_version }}.gpg] https://pkgs.k8s.io/core:/stable:/v{{ target_kubernetes_version }}/deb/ /" state: present