Merge pull request #12163 from VannTen/cleanup/etcd_inv_sample

Move etcd inventory sample doc to role defaults

roles/kubernetes/control-plane/meta/main.yml

@@ -7,3 +7,4 @@ dependencies:
       - etcd_deployment_type == "kubeadm"
       - not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
   - role: network_plugin/calico_defaults
+  - role: etcd_defaults

roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2

@@ -59,18 +59,10 @@ etcd:
 {% if etcd_listen_metrics_urls is defined %}
       listen-metrics-urls: "{{ etcd_listen_metrics_urls }}"
 {% endif %}
-{% if etcd_snapshot_count is defined %}
       snapshot-count: "{{ etcd_snapshot_count }}"
-{% endif %}
-{% if etcd_quota_backend_bytes is defined %}
       quota-backend-bytes: "{{ etcd_quota_backend_bytes }}"
-{% endif %}
-{% if etcd_max_request_bytes is defined %}
       max-request-bytes: "{{ etcd_max_request_bytes }}"
-{% endif %}
-{% if etcd_log_level is defined %}
       log-level: "{{ etcd_log_level }}"
-{% endif %}
 {% for key, value in etcd_extra_vars.items() %}
       {{ key }}: "{{ value }}"
 {% endfor %}

roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2

@@ -68,22 +68,14 @@ etcd:
     - name: listen-metrics-urls
       value: "{{ etcd_listen_metrics_urls }}"
 {% endif %}
-{% if etcd_snapshot_count is defined %}
     - name: snapshot-count
       value: "{{ etcd_snapshot_count }}"
-{% endif %}
-{% if etcd_quota_backend_bytes is defined %}
     - name: quota-backend-bytes
       value: "{{ etcd_quota_backend_bytes }}"
-{% endif %}
-{% if etcd_max_request_bytes is defined %}
     - name: max-request-bytes
       value: "{{ etcd_max_request_bytes }}"
-{% endif %}
-{% if etcd_log_level is defined %}
     - name: log-level
       value: "{{ etcd_log_level }}"
-{% endif %}
 {% for key, value in etcd_extra_vars.items() %}
     - name: {{ key }}
       value: "{{ value }}"