Missed the secure part

[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 bc71bb9..38e3f47 100644 (file)
--- a/ansible/roles/kube_master/defaults/main.yaml
+++ b/ansible/roles/kube_master/defaults/main.yaml
@@ -30,6 +30,7 @@ apiserver_feature_gates:
   DevicePlugins: true
   HugePages: true
   TokenRequest: true
+  SCTPSupport: true
 
 apiserver_params:
   - "--admission-control={{ apiserver_admission_controllers | join(',') }}"
@@ -39,8 +40,8 @@ apiserver_params:
   - "--apiserver-count={{ groups['caas_master']|length|int }}"
   - "--audit-policy-file={{ caas.caas_policy_directory }}/audit-policy.yaml"
   - "--audit-log-format=json"
-  - "--audit-log-maxbackup=10"
-  - "--audit-log-maxsize=100"
+  - "--audit-log-maxsize={{ caas.audit_log_file_size }}"
+  - "--audit-log-maxbackup={{ ((audit_disc_size.stdout|int*caas.caas_max_audit_size)/caas.audit_log_file_size)|int }}"
   - "--audit-log-path=/var/log/audit/kube_apiserver/kube-apiserver-audit.log"
   - "--authorization-mode=Node,RBAC"
   - "--bind-address={{ apiserver }}"
@@ -49,7 +50,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={% for host in groups['caas_master'] %}https://{{ hostvars[host]['networking']['infra_internal']['ip'] }}:{{ caas.etcd_api_port }}{% if not loop.last %},{% endif %}{% 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"