Compare commits

...

2 Commits

Author SHA1 Message Date
Jon
c993a0e3fe feat(kubernetes): dont install helm controller by default
ref: #34
2024-12-05 12:15:11 +09:30
Jon
94c9c83aa6 feat(kubernetes): dont install cni by default
ref: #34
2024-12-04 04:54:19 +09:30
3 changed files with 27 additions and 2 deletions

View File

@ -38,6 +38,8 @@ nfc_role_kubernetes_configure_firewall: true
nfc_role_kubernetes_etcd_enabled: false nfc_role_kubernetes_etcd_enabled: false
nfc_role_kubernetes_install_cni: false
nfc_role_kubernetes_install_olm: false nfc_role_kubernetes_install_olm: false
nfc_role_kubernetes_install_helm: true nfc_role_kubernetes_install_helm: true

View File

@ -17,6 +17,8 @@
register: file_calico_yaml_metadata register: file_calico_yaml_metadata
when: > when: >
nfc_role_kubernetes_prime | bool nfc_role_kubernetes_prime | bool
and
nfc_role_kubernetes_install_cni | default(false) | bool
- name: Check for calico Operator deployment manifest - name: Check for calico Operator deployment manifest
@ -25,6 +27,8 @@
register: file_calico_operator_yaml_metadata register: file_calico_operator_yaml_metadata
when: > when: >
nfc_role_kubernetes_prime | bool nfc_role_kubernetes_prime | bool
and
nfc_role_kubernetes_install_cni | default(false) | bool
- name: Install dependent packages - name: Install dependent packages
@ -523,6 +527,8 @@
{{ {{
nfc_role_kubernetes_prime | bool nfc_role_kubernetes_prime | bool
and and
nfc_role_kubernetes_install_cni | default(false) | bool
and
( (
( (
not file_calico_operator_yaml_metadata.stat.exists not file_calico_operator_yaml_metadata.stat.exists
@ -605,6 +611,8 @@
nfc_role_kubernetes_prime | bool nfc_role_kubernetes_prime | bool
and and
not nfc_role_kubernetes_cluster_upgraded | default(false) | bool not nfc_role_kubernetes_cluster_upgraded | default(false) | bool
and
nfc_role_kubernetes_install_cni | default(false) | bool
- name: Install MetalLB Operator - name: Install MetalLB Operator
@ -724,6 +732,8 @@
when: > when: >
nfc_role_kubernetes_prime | bool nfc_role_kubernetes_prime | bool
and and
nfc_role_kubernetes_install_cni | default(false) | bool
and
kubernetes_config.cluster.networking.encrypt | default(false) | bool kubernetes_config.cluster.networking.encrypt | default(false) | bool
and and
not nfc_role_kubernetes_cluster_upgraded | default(false) | bool not nfc_role_kubernetes_cluster_upgraded | default(false) | bool

View File

@ -100,8 +100,7 @@
}) })
-%} -%}
{%- endif -%}
{%- endif -%}
{%- if ( {%- if (
not nfc_kubernetes_enable_metallb | default(false) not nfc_kubernetes_enable_metallb | default(false)
@ -116,6 +115,20 @@
{%- endif -%} {%- endif -%}
{%- if (
nfc_role_kubernetes_install_helm | default(false)
) -%}
{%- set disable = servers_config.disable + [ "helm-controller" ] -%}
{%
set servers_config = servers_config | combine({
"disable": disable
})
-%}
{%- endif -%}
{# Combine Remaining Server Objects #} {# Combine Remaining Server Objects #}
{% {%