From 62b80237ef9fd335f6ff6ff422941d4f3bc88a48 Mon Sep 17 00:00:00 2001 From: Dov Benyomin Sohacheski Date: Sun, 12 May 2024 12:42:51 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9E=95=20Add=20default=20values=20to=20r?= =?UTF-8?q?oles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/k3s_agent/defaults/main.yml | 2 ++ roles/k3s_server/defaults/main.yml | 2 ++ roles/reset/defaults/main.yml | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 roles/k3s_agent/defaults/main.yml create mode 100644 roles/reset/defaults/main.yml diff --git a/roles/k3s_agent/defaults/main.yml b/roles/k3s_agent/defaults/main.yml new file mode 100644 index 0000000..0b45925 --- /dev/null +++ b/roles/k3s_agent/defaults/main.yml @@ -0,0 +1,2 @@ +--- +systemd_dir: /etc/systemd/system diff --git a/roles/k3s_server/defaults/main.yml b/roles/k3s_server/defaults/main.yml index 46f1528..1ab5b83 100644 --- a/roles/k3s_server/defaults/main.yml +++ b/roles/k3s_server/defaults/main.yml @@ -18,3 +18,5 @@ server_init_args: >- --token {{ k3s_token }} {% endif %} {{ extra_server_args | default('') }} + +systemd_dir: /etc/systemd/system diff --git a/roles/reset/defaults/main.yml b/roles/reset/defaults/main.yml new file mode 100644 index 0000000..0b45925 --- /dev/null +++ b/roles/reset/defaults/main.yml @@ -0,0 +1,2 @@ +--- +systemd_dir: /etc/systemd/system From 16fb511d49b99d519950053b1167b37c7c3ed6f2 Mon Sep 17 00:00:00 2001 From: Dov Benyomin Sohacheski Date: Tue, 21 May 2024 09:23:52 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=9A=20Move=20to=20use=20meta=20fil?= =?UTF-8?q?es=20for=20roles?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/download/meta/main.yml | 8 +++++++ roles/k3s_agent/defaults/main.yml | 3 +++ roles/k3s_agent/meta/main.yml | 29 +++++++++++++++++++++++ roles/k3s_custom_registries/meta/main.yml | 19 +++++++++++++++ roles/k3s_server/defaults/main.yml | 4 ++-- roles/k3s_server/meta/main.yml | 25 +++++++++++++++++++ 6 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 roles/download/meta/main.yml create mode 100644 roles/k3s_agent/meta/main.yml create mode 100644 roles/k3s_custom_registries/meta/main.yml create mode 100644 roles/k3s_server/meta/main.yml diff --git a/roles/download/meta/main.yml b/roles/download/meta/main.yml new file mode 100644 index 0000000..e7911d5 --- /dev/null +++ b/roles/download/meta/main.yml @@ -0,0 +1,8 @@ +--- +argument_specs: + main: + short_description: Manage the downloading of K3S binaries + options: + k3s_version: + description: The desired version of K3S + required: true diff --git a/roles/k3s_agent/defaults/main.yml b/roles/k3s_agent/defaults/main.yml index 0b45925..037c1f3 100644 --- a/roles/k3s_agent/defaults/main.yml +++ b/roles/k3s_agent/defaults/main.yml @@ -1,2 +1,5 @@ --- +is_pxe_booted: false +extra_agent_args: "" +group_name_master: master systemd_dir: /etc/systemd/system diff --git a/roles/k3s_agent/meta/main.yml b/roles/k3s_agent/meta/main.yml new file mode 100644 index 0000000..a2f694c --- /dev/null +++ b/roles/k3s_agent/meta/main.yml @@ -0,0 +1,29 @@ +--- +argument_specs: + main: + short_description: Setup k3s agents + options: + apiserver_endpoint: + description: Virtual ip-address configured on each master + required: true + + extra_agent_args: + description: Virtual ip-address configured on each master + default: Arguments passed to the systemd service + + group_name_master: + description: Name of the master group + default: master + + proxy_env: + type: dict + description: Internet proxy configurations + default: ~ + options: + HTTP_PROXY: + HTTPS_PROXY: + NO_PROXY: + + systemd_dir: + description: Path to systemd services + default: /etc/systemd/system diff --git a/roles/k3s_custom_registries/meta/main.yml b/roles/k3s_custom_registries/meta/main.yml new file mode 100644 index 0000000..0ec0e7c --- /dev/null +++ b/roles/k3s_custom_registries/meta/main.yml @@ -0,0 +1,19 @@ +--- +argument_specs: + main: + short_description: Configure the use of a custom container registry + options: + custom_registries_yaml: + description: + - YAML block defining custom registries. + - > + The following is an example that pulls all images used in + this playbook through your private registries. + - > + It also allows you to pull your own images from your private + registry, without having to use imagePullSecrets in your + deployments. + - > + If all you need is your own images and you don't care about + caching the docker/quay/ghcr.io images, you can just remove + those from the mirrors: section. diff --git a/roles/k3s_server/defaults/main.yml b/roles/k3s_server/defaults/main.yml index 1ab5b83..f088c96 100644 --- a/roles/k3s_server/defaults/main.yml +++ b/roles/k3s_server/defaults/main.yml @@ -2,9 +2,9 @@ # If you want to explicitly define an interface that ALL control nodes # should use to propagate the VIP, define it here. Otherwise, kube-vip # will determine the right interface automatically at runtime. -kube_vip_iface: null +kube_vip_iface: ~ -# Name of the master group +kube_vip_cloud_provider_tag_version: main group_name_master: master # yamllint disable rule:line-length diff --git a/roles/k3s_server/meta/main.yml b/roles/k3s_server/meta/main.yml new file mode 100644 index 0000000..cbe37ea --- /dev/null +++ b/roles/k3s_server/meta/main.yml @@ -0,0 +1,25 @@ +--- +argument_specs: + main: + short_description: Setup k3s servers + options: + group_name_master: + description: Name of the master group + default: master + + kube_vip_cloud_provider_tag_version: + description: Tag for kube-vip-cloud-provider manifest when enabled + default: main + + kube_vip_lb_ip_range: + description: IP range for kube-vip load balancer + default: ~ + + proxy_env: + type: dict + description: Internet proxy configurations + default: ~ + options: + HTTP_PROXY: + HTTPS_PROXY: + NO_PROXY: