From c4547306ce44e4ee069e6533416bac1a77c3d49e Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 25 Feb 2020 03:48:09 -0500 Subject: [PATCH] add option to specify local storage path (#10) --- README.md | 2 ++ defaults/main.yml | 3 +++ molecule/default/playbook-no-deploy.yml | 1 + templates/k3s.service.j2 | 3 +++ 4 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 3333f9f..2a2ed01 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,8 @@ consistency. | `k3s_no_traefik` | Do not use Traefik | `false` | | `k3s_no_servicelb` | Do not use ServiceLB, necessary for using something like MetalLB. | `false` | | `k3s_no_local_storage` | Do not use Local Storage | `false` | +| `k3s_default_local_storage_path` | Set Local Storage Path. Specify `false` for default. | +`false` | | `k3s_no_metrics_server` | Do not deploy metrics server | `false` | | `k3s_disable_scheduler` | Disable Kubernetes default scheduler | `false` | | `k3s_disable_cloud_controller` | Disable k3s default cloud controller manager. | `false` | diff --git a/defaults/main.yml b/defaults/main.yml index 330727a..def2848 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -92,3 +92,6 @@ k3s_disable_cloud_controller: false # Disable k3s network policy controller k3s_disable_network_policy: false + +# Default local storage path for local provisioner storage class, if set to "false" we will use the default +k3s_default_local_storage_path: false diff --git a/molecule/default/playbook-no-deploy.yml b/molecule/default/playbook-no-deploy.yml index 16a8ab4..127fbf5 100644 --- a/molecule/default/playbook-no-deploy.yml +++ b/molecule/default/playbook-no-deploy.yml @@ -8,6 +8,7 @@ k3s_no_traefik: true k3s_no_servicelb: true k3s_no_local_storage: true + k3s_default_local_storage_path: false k3s_no_metrics_server: true k3s_disable_scheduler: true k3s_disable_cloud_controller: true diff --git a/templates/k3s.service.j2 b/templates/k3s.service.j2 index 89ebd1a..7f096c6 100644 --- a/templates/k3s.service.j2 +++ b/templates/k3s.service.j2 @@ -48,6 +48,9 @@ ExecStart={{ k3s_install_dir }}/k3s {{ ' --no-deploy coredns' if k3s_no_coredns else '' }}{{ ' --no-deploy servicelb' if k3s_no_servicelb else '' }}{{ ' --no-deploy traefik' if k3s_no_traefik else '' }}{{ ' --no-deploy local-storage' if k3s_no_local_storage else '' }}{{ ' --no-deploy metrics-server' if k3s_no_metrics_server else '' }} {% endif %} {% endif %} + {% if not k3s_no_local_storage and k3s_default_local_storage_path is defined and k3s_default_local_storage_path %} + --default-local-storage-path {{ k3s_default_local_storage_path }} + {% endif %} {% if k3s_cluster_dns is defined and k3s_cluster_dns %} --cluster-dns {{ k3s_cluster_dns }} {% endif %}