HugePages are GA from 1.16.0

[ta/caas-kubernetes.git] / ansible / roles / kube_master / defaults / main.yaml

diff --git a/ansible/roles/kube_master/defaults/main.yaml b/ansible/roles/kube_master/defaults/main.yaml
index fad1e09..159479a 100644 (file)
--- a/ansible/roles/kube_master/defaults/main.yaml
+++ b/ansible/roles/kube_master/defaults/main.yaml
@@ -28,7 +28,6 @@ apiserver_admission_controllers:
 apiserver_feature_gates:
   CPUManager: false
   DevicePlugins: true
-  HugePages: true
   TokenRequest: true
   SCTPSupport: true
 
@@ -50,7 +49,7 @@ apiserver_params:
   - "--etcd-cafile=/etc/etcd/ssl/ca.pem"
   - "--etcd-certfile=/etc/etcd/ssl/etcd{{ nodeindex }}.pem"
   - "--etcd-keyfile=/etc/etcd/ssl/etcd{{ nodeindex }}-key.pem"
-  - "--etcd-servers=http://{{ hostvars[hostname]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% for host in ( groups['caas_master'] | reject('search', hostname) ) %},http://{{ hostvars[host]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% endfor %}"
+  - "--etcd-servers=https://{{ hostvars[hostname]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% for host in ( groups['caas_master'] | reject('search', hostname) ) %},https://{{ hostvars[host]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% endfor %}"
   - "--experimental-encryption-provider-config={{ caas.cert_path }}/{{ caas._secrets_conf }}"
   - "--feature-gates={{ apiserver_feature_gates | get_kube_options }}"
   - "--insecure-port=0"
@@ -76,9 +75,7 @@ apiserver_params:
 controllermanager_feature_gates:
   CPUManager: false
   DevicePlugins: true
-  HugePages: true
 
 scheduler_feature_gates:
   CPUManager: false
   DevicePlugins: true
-  HugePages: true