diff --git a/group_vars/all/global.yaml b/group_vars/all/global.yaml index 122ee5e..70f4994 100644 --- a/group_vars/all/global.yaml +++ b/group_vars/all/global.yaml @@ -14,7 +14,7 @@ # no_proxy: '127.0.0.1,localhost,.example.com,.svc,.local,.localdomain,.internal,127.0.1.1,127.254.254.254,169.254.169.254,169.254.169.253,169.254.169.123,/var/run/docker.sock,.sock,sock,.socket' ##### -KUBERNETES_VERSION: "1.25.4" +KUBERNETES_VERSION: "{{ KUBERNETES_VERSION_CUSTOM | default ('1.25.4') }}" # Software versions (used by installation, package manager, image pull, etc. ) KEEPALIVED_VERSION: "1.3.5" diff --git a/group_vars/all/network.yml b/group_vars/all/network.yml index 89dbef4..59680a1 100644 --- a/group_vars/all/network.yml +++ b/group_vars/all/network.yml @@ -4,7 +4,7 @@ CLUSTER_NAME: demok8s # used only for defining the clusterConfiguration and joi ## ensure you have the DNS set for wildcard, and pointing all the trafic to master or similar setup custom: networking: - dnsDomain: "{{ CLUSTER_NAME }}.myk8s.corp.example.com" # For MasterHA, if you have dns, put the desired cluster domain here. If no DNS change possible on your side, and you want MasterHA, fix the below 2 values accordinly + dnsDomain: "{{ CLUSTER_NAME }}.{{ CORP_DNS_DOMAIN | default ('corp.example.com') }}" # For MasterHA, if you have dns, put the desired cluster domain here. If no DNS change possible on your side, and you want MasterHA, fix the below 2 values accordinly ###### ## masterha_* params are requried when you have MasterHA (meaning when your inventory has "secondary-masters" section not-empty) @@ -19,7 +19,7 @@ custom: masterha_ip: "10.1.2.3" #| default('') }}" # Important when you have MasterHA; # IP of either your LB or the VIP to be used. ## masterha_fqdn is usually the dns name of masterha_ip above. (We cannot get it automatically in ansible...) ## This value is important in order to set apiServerCertSANs in the certs correctly - masterha_fqdn: "master-{{ CLUSTER_NAME }}.corp.example.com" # Important when you have MasterHA, in order to set apiServerCertSANs correctly + masterha_fqdn: "master-{{ CLUSTER_NAME }}.{{ CORP_DNS_DOMAIN | default ('corp.example.com') }}" # Important when you have MasterHA, in order to set apiServerCertSANs correctly #masterha_fqdn: "{{ lookup('dig', masterha_ip, 'qtype=PTR') }}" # but requires some pip modules on host... #masterha_bindPort: 6443 #default is 6443; We recommend to keep it 6443.