Add .editorconfig file (#6307)

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*.{yaml,yml,yml.j2,yaml.j2}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+
+[{Dockerfile}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8

Dockerfile

@@ -6,12 +6,12 @@ RUN apt update -y && \
     apt install -y \
     libssl-dev python3-dev sshpass apt-transport-https jq moreutils \
     ca-certificates curl gnupg2 software-properties-common python3-pip rsync
-RUN  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
+RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
-     add-apt-repository \
+    add-apt-repository \
-     "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-     $(lsb_release -cs) \
+    $(lsb_release -cs) \
-     stable" \
+    stable" \
-     && apt update -y && apt-get install docker-ce -y
+    && apt update -y && apt-get install docker-ce -y
 COPY . .
 RUN /usr/bin/python3 -m pip install pip -U && /usr/bin/python3 -m pip install -r tests/requirements.txt && python3 -m pip install -r requirements.txt && update-alternatives --install /usr/bin/python python /usr/bin/python3 1
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl \

contrib/vault/roles/vault/tasks/bootstrap/start_vault_temp.yml

@@ -6,11 +6,11 @@
 
 - name: bootstrap/start_vault_temp | Start single node Vault with file backend
   command: >
-           docker run -d --cap-add=IPC_LOCK --name {{ vault_temp_container_name }}
+          docker run -d --cap-add=IPC_LOCK --name {{ vault_temp_container_name }}
-           -p {{ vault_port }}:{{ vault_port }}
+          -p {{ vault_port }}:{{ vault_port }}
-           -e 'VAULT_LOCAL_CONFIG={{ vault_temp_config|to_json }}'
+          -e 'VAULT_LOCAL_CONFIG={{ vault_temp_config|to_json }}'
-           -v /etc/vault:/etc/vault
+          -v /etc/vault:/etc/vault
-           {{ vault_image_repo }}:{{ vault_version }} server
+          {{ vault_image_repo }}:{{ vault_version }} server
 
 - name: bootstrap/start_vault_temp | Start again single node Vault with file backend
   command: docker start {{ vault_temp_container_name }}

contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml

@@ -21,9 +21,9 @@
 - name: bootstrap/sync_secrets | Print out warning message if secrets are not available and vault is initialized
   pause:
     prompt: >
-         Vault orchestration may not be able to proceed. The Vault cluster is initialized, but
+          Vault orchestration may not be able to proceed. The Vault cluster is initialized, but
-         'root_token' or 'unseal_keys' were not found in {{ vault_secrets_dir }}. These are
+          'root_token' or 'unseal_keys' were not found in {{ vault_secrets_dir }}. These are
-         needed for many vault orchestration steps.
+          needed for many vault orchestration steps.
   when: vault_cluster_is_initialized and not vault_secrets_available
 
 - name: bootstrap/sync_secrets | Cat root_token from a vault host

contrib/vault/roles/vault/tasks/shared/check_etcd.yml

@@ -25,6 +25,6 @@
 - name: check_etcd | Fail if etcd is not available and needed
   fail:
     msg: >
-         Unable to start Vault cluster! Etcd is not available at
+        Unable to start Vault cluster! Etcd is not available at
-         {{ vault_etcd_url.split(',') | first }} however it is needed by Vault as a backend.
+        {{ vault_etcd_url.split(',') | first }} however it is needed by Vault as a backend.
   when: vault_etcd_needed|d() and not vault_etcd_available

contrib/vault/roles/vault/tasks/shared/check_vault.yml

@@ -46,7 +46,7 @@
   set_fact:
     vault_cluster_is_initialized: >-
       {{ vault_is_initialized or
-         hostvars[item]['vault_is_initialized'] or
+        hostvars[item]['vault_is_initialized'] or
-         ('value' in vault_etcd_exists.stdout|default('')) }}
+        ('value' in vault_etcd_exists.stdout|default('')) }}
   with_items: "{{ groups.vault }}"
   run_once: true

contrib/vault/roles/vault/tasks/shared/create_role.yml

@@ -6,9 +6,9 @@
     ca_cert: "{{ vault_cert_dir }}/ca.pem"
     name: "{{ create_role_name }}"
     rules: >-
-           {%- if create_role_policy_rules|d("default") == "default" -%}
+            {%- if create_role_policy_rules|d("default") == "default" -%}
-           {{
+            {{
-           { 'path': {
+            { 'path': {
                 create_role_mount_path + '/issue/' + create_role_name: {'policy': 'write'},
                 create_role_mount_path + '/roles/' + create_role_name: {'policy': 'read'}
             }} | to_json + '\n'
@@ -24,13 +24,13 @@
     ca_cert: "{{ vault_cert_dir }}/ca.pem"
     secret: "{{ create_role_mount_path }}/roles/{{ create_role_name }}"
     data: |
-     {%- if create_role_options|d("default") == "default" -%}
+      {%- if create_role_options|d("default") == "default" -%}
-     {
+      {
-     allow_any_name: true
+      allow_any_name: true
-     }
+      }
-     {%- else -%}
+      {%- else -%}
-     {{ create_role_options | to_json }}
+      {{ create_role_options | to_json }}
-     {%- endif -%}
+      {%- endif -%}
 
 ## Userpass based auth method
 

contrib/vault/roles/vault/tasks/shared/gen_userpass.yml

@@ -18,8 +18,8 @@
 - name: shared/gen_userpass | Copy credentials to all hosts in the group
   copy:
     content: >
-             {{
+            {{
-             {'username': gen_userpass_username,
+            {'username': gen_userpass_username,
-              'password': gen_userpass_password} | to_nice_json(indent=4)
+            'password': gen_userpass_password} | to_nice_json(indent=4)
-             }}
+            }}
     dest: "{{ vault_roles_dir }}/{{ gen_userpass_role }}/userpass"

roles/container-engine/containerd/vars/debian.yml

@@ -15,8 +15,8 @@ containerd_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb {{ containerd_debian_repo_base_url }}
+      deb {{ containerd_debian_repo_base_url }}
-       {{ ansible_distribution_release|lower }}
+      {{ ansible_distribution_release|lower }}
-       {{ containerd_debian_repo_component }}
+      {{ containerd_debian_repo_component }}
 
 runc_binary: /usr/bin/runc

roles/container-engine/containerd/vars/ubuntu-amd64.yml

@@ -15,8 +15,8 @@ containerd_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb {{ containerd_ubuntu_repo_base_url }}
+      deb {{ containerd_ubuntu_repo_base_url }}
-       {{ ansible_distribution_release|lower }}
+      {{ ansible_distribution_release|lower }}
-       {{ containerd_ubuntu_repo_component }}
+      {{ containerd_ubuntu_repo_component }}
 
 runc_binary: /usr/bin/runc

roles/container-engine/docker/vars/debian.yml

@@ -41,9 +41,9 @@ docker_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb {{ docker_debian_repo_base_url }}
+      deb {{ docker_debian_repo_base_url }}
-       {{ ansible_distribution_release|lower }}
+      {{ ansible_distribution_release|lower }}
-       stable
+      stable
 
 dockerproject_repo_key_info:
   pkg_key: apt_key
@@ -55,6 +55,6 @@ dockerproject_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb {{ docker_debian_repo_base_url }}
+      deb {{ docker_debian_repo_base_url }}
-       {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
+      {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
-       main
+      main

roles/container-engine/docker/vars/ubuntu-amd64.yml

@@ -41,9 +41,9 @@ docker_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
+      deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
-       {{ ansible_distribution_release|lower }}
+      {{ ansible_distribution_release|lower }}
-       stable
+      stable
 
 dockerproject_repo_key_info:
   pkg_key: apt_key
@@ -55,6 +55,6 @@ dockerproject_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
+      deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
-       {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
+      {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
-       main
+      main

roles/container-engine/docker/vars/ubuntu-arm64.yml

@@ -37,9 +37,9 @@ docker_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
+      deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
-       {{ ansible_distribution_release|lower }}
+      {{ ansible_distribution_release|lower }}
-       stable
+      stable
 
 dockerproject_repo_key_info:
   pkg_key: apt_key
@@ -51,6 +51,6 @@ dockerproject_repo_info:
   pkg_repo: apt_repository
   repos:
     - >
-       deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
+      deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
-       {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
+      {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
-       main
+      main

roles/etcd/tasks/check_certs.yml

@@ -30,14 +30,14 @@
   with_items: "{{ expected_files }}"
   vars:
     expected_files: >-
-       ['{{ etcd_cert_dir }}/ca.pem',
+      ['{{ etcd_cert_dir }}/ca.pem',
-       {% set all_etcd_hosts = groups['k8s-cluster']|union(groups['etcd'])|union(groups['calico-rr']|default([]))|unique|sort %}
+      {% set all_etcd_hosts = groups['k8s-cluster']|union(groups['etcd'])|union(groups['calico-rr']|default([]))|unique|sort %}
-       {% for host in all_etcd_hosts %}
+      {% for host in all_etcd_hosts %}
-         '{{ etcd_cert_dir }}/node-{{ host }}-key.pem',
+        '{{ etcd_cert_dir }}/node-{{ host }}-key.pem',
-         '{{ etcd_cert_dir }}/admin-{{ host }}-key.pem',
+        '{{ etcd_cert_dir }}/admin-{{ host }}-key.pem',
-         '{{ etcd_cert_dir }}/member-{{ host }}-key.pem'
+        '{{ etcd_cert_dir }}/member-{{ host }}-key.pem'
-         {% if not loop.last %}{{','}}{% endif %}
+        {% if not loop.last %}{{','}}{% endif %}
-       {% endfor %}]
+      {% endfor %}]
 
 - name: "Check_certs | Set 'gen_master_certs' to true"
   set_fact:

roles/etcd/tasks/gen_certs_script.yml

@@ -111,9 +111,9 @@
 
 - name: Gen_certs | Set cert names per node
   set_fact:
-    my_etcd_node_certs: ['ca.pem',
+    my_etcd_node_certs: [ 'ca.pem',
-                         'node-{{ inventory_hostname }}.pem',
+                          'node-{{ inventory_hostname }}.pem',
-                         'node-{{ inventory_hostname }}-key.pem']
+                          'node-{{ inventory_hostname }}-key.pem']
   tags:
     - facts
 

roles/etcd/tasks/install_etcdctl_docker.yml

@@ -1,9 +1,9 @@
 ---
 - name: Install | Copy etcdctl binary from docker container
   command: sh -c "{{ docker_bin_dir }}/docker rm -f etcdctl-binarycopy;
-           {{ docker_bin_dir }}/docker create --name etcdctl-binarycopy {{ etcd_image_repo }}:{{ etcd_image_tag }} &&
+            {{ docker_bin_dir }}/docker create --name etcdctl-binarycopy {{ etcd_image_repo }}:{{ etcd_image_tag }} &&
-           {{ docker_bin_dir }}/docker cp etcdctl-binarycopy:/usr/local/bin/etcdctl {{ bin_dir }}/etcdctl &&
+            {{ docker_bin_dir }}/docker cp etcdctl-binarycopy:/usr/local/bin/etcdctl {{ bin_dir }}/etcdctl &&
-           {{ docker_bin_dir }}/docker rm -f etcdctl-binarycopy"
+            {{ docker_bin_dir }}/docker rm -f etcdctl-binarycopy"
   register: etcdctl_install_result
   until: etcdctl_install_result.rc == 0
   retries: "{{ etcd_retries }}"

roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2

@@ -325,32 +325,32 @@ apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
 bindAddress: {{ kube_proxy_bind_address }}
 clientConnection:
- acceptContentTypes: {{ kube_proxy_client_accept_content_types }}
+  acceptContentTypes: {{ kube_proxy_client_accept_content_types }}
- burst: {{ kube_proxy_client_burst }}
+  burst: {{ kube_proxy_client_burst }}
- contentType: {{ kube_proxy_client_content_type }}
+  contentType: {{ kube_proxy_client_content_type }}
- kubeconfig: {{ kube_proxy_client_kubeconfig }}
+  kubeconfig: {{ kube_proxy_client_kubeconfig }}
- qps: {{ kube_proxy_client_qps }}
+  qps: {{ kube_proxy_client_qps }}
 clusterCIDR: {{ kube_pods_subnet }}
 configSyncPeriod: {{ kube_proxy_config_sync_period }}
 conntrack:
- maxPerCore: {{ kube_proxy_conntrack_max_per_core }}
+  maxPerCore: {{ kube_proxy_conntrack_max_per_core }}
- min: {{ kube_proxy_conntrack_min }}
+  min: {{ kube_proxy_conntrack_min }}
- tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }}
+  tcpCloseWaitTimeout: {{ kube_proxy_conntrack_tcp_close_wait_timeout }}
- tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
+  tcpEstablishedTimeout: {{ kube_proxy_conntrack_tcp_established_timeout }}
 enableProfiling: {{ kube_proxy_enable_profiling }}
 healthzBindAddress: {{ kube_proxy_healthz_bind_address }}
 hostnameOverride: {{ kube_override_hostname }}
 iptables:
- masqueradeAll: {{ kube_proxy_masquerade_all }}
+  masqueradeAll: {{ kube_proxy_masquerade_all }}
- masqueradeBit: {{ kube_proxy_masquerade_bit }}
+  masqueradeBit: {{ kube_proxy_masquerade_bit }}
- minSyncPeriod: {{ kube_proxy_min_sync_period }}
+  minSyncPeriod: {{ kube_proxy_min_sync_period }}
- syncPeriod: {{ kube_proxy_sync_period }}
+  syncPeriod: {{ kube_proxy_sync_period }}
 ipvs:
- excludeCIDRs: {{ kube_proxy_exclude_cidrs }}
+  excludeCIDRs: {{ kube_proxy_exclude_cidrs }}
- minSyncPeriod: {{ kube_proxy_min_sync_period }}
+  minSyncPeriod: {{ kube_proxy_min_sync_period }}
- scheduler: {{ kube_proxy_scheduler }}
+  scheduler: {{ kube_proxy_scheduler }}
- syncPeriod: {{ kube_proxy_sync_period }}
+  syncPeriod: {{ kube_proxy_sync_period }}
- strictARP: {{ kube_proxy_strict_arp }}
+  strictARP: {{ kube_proxy_strict_arp }}
 metricsBindAddress: {{ kube_proxy_metrics_bind_address }}
 mode: {{ kube_proxy_mode }}
 nodePortAddresses: {{ kube_proxy_nodeport_addresses }}

roles/kubernetes/node-label/tasks/main.yml

@@ -40,7 +40,7 @@
 
 - name: Set label to node
   command: >-
-     {{ bin_dir }}/kubectl label node {{ inventory_hostname }} {{ item }} --overwrite=true
+      {{ bin_dir }}/kubectl label node {{ inventory_hostname }} {{ item }} --overwrite=true
   loop: "{{ role_node_labels + inventory_node_labels }}"
   delegate_to: "{{ groups['kube-master'][0] }}"
   changed_when: false

roles/kubernetes/preinstall/tasks/0090-etchosts.yml

@@ -44,8 +44,8 @@
 - name: Hosts | Extract existing entries for localhost from hosts file
   set_fact:
     etc_hosts_localhosts_dict: >-
-       {%- set splitted = (item | regex_replace('[ \t]+', ' ')|regex_replace('#.*$')|trim).split( ' ') -%}
+      {%- set splitted = (item | regex_replace('[ \t]+', ' ')|regex_replace('#.*$')|trim).split( ' ') -%}
-       {{ etc_hosts_localhosts_dict|default({}) | combine({splitted[0]: splitted[1::] }) }}
+      {{ etc_hosts_localhosts_dict|default({}) | combine({splitted[0]: splitted[1::] }) }}
   with_items: "{{ (etc_hosts_content['content'] | b64decode).splitlines() }}"
   when:
     - etc_hosts_content.content is defined

roles/kubernetes/tokens/tasks/check-tokens.yml

@@ -27,9 +27,9 @@
     sync_tokens: >-
       {%- set tokens = {'sync': False} -%}
       {%- for server in groups['kube-master'] | intersect(ansible_play_batch)
-         if (not hostvars[server].known_tokens.stat.exists) or
+        if (not hostvars[server].known_tokens.stat.exists) or
-         (hostvars[server].known_tokens.stat.checksum|default('') != known_tokens_master.stat.checksum|default('')) -%}
+        (hostvars[server].known_tokens.stat.checksum|default('') != known_tokens_master.stat.checksum|default('')) -%}
-         {%- set _ = tokens.update({'sync': True}) -%}
+        {%- set _ = tokens.update({'sync': True}) -%}
       {%- endfor -%}
       {{ tokens.sync }}
   run_once: true

roles/kubespray-defaults/defaults/main.yaml

@@ -434,13 +434,13 @@ loadbalancer_apiserver_type: "nginx"
 apiserver_loadbalancer_domain_name: "lb-apiserver.kubernetes.local"
 kube_apiserver_endpoint: |-
   {% if loadbalancer_apiserver is defined -%}
-       https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port|default(kube_apiserver_port) }}
+      https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port|default(kube_apiserver_port) }}
   {%- elif not is_kube_master and loadbalancer_apiserver_localhost -%}
-       https://localhost:{{ loadbalancer_apiserver_port|default(kube_apiserver_port) }}
+      https://localhost:{{ loadbalancer_apiserver_port|default(kube_apiserver_port) }}
   {%- elif is_kube_master -%}
-       https://{{ kube_apiserver_bind_address | regex_replace('0\.0\.0\.0','127.0.0.1') }}:{{ kube_apiserver_port }}
+      https://{{ kube_apiserver_bind_address | regex_replace('0\.0\.0\.0','127.0.0.1') }}:{{ kube_apiserver_port }}
   {%- else -%}
-       https://{{ first_kube_master }}:{{ kube_apiserver_port }}
+      https://{{ first_kube_master }}:{{ kube_apiserver_port }}
   {%- endif %}
 kube_apiserver_insecure_endpoint: >-
   http://{{ kube_apiserver_insecure_bind_address | regex_replace('0\.0\.0\.0','127.0.0.1') }}:{{ kube_apiserver_insecure_port }}

roles/network_plugin/calico/tasks/install.yml

@@ -198,11 +198,11 @@
     "apiVersion": "projectcalico.org/v3",
     "kind": "BGPPeer",
     "metadata": {
-       "name": "global-{{ item.router_id }}"
+      "name": "global-{{ item.router_id }}"
     },
     "spec": {
-       "asNumber": "{{ item.as }}",
+      "asNumber": "{{ item.as }}",
-       "peerIP": "{{ item.router_id }}"
+      "peerIP": "{{ item.router_id }}"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
   register: output
   retries: 4
@@ -220,11 +220,11 @@
     "apiVersion": "projectcalico.org/v3",
     "kind": "BGPPeer",
     "metadata": {
-       "name": "peer-to-rrs"
+      "name": "peer-to-rrs"
     },
     "spec": {
-       "nodeSelector": "!has(i-am-a-route-reflector)",
+      "nodeSelector": "!has(i-am-a-route-reflector)",
-       "peerSelector": "has(i-am-a-route-reflector)"
+      "peerSelector": "has(i-am-a-route-reflector)"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
   register: output
   retries: 4
@@ -242,11 +242,11 @@
     "apiVersion": "projectcalico.org/v3",
     "kind": "BGPPeer",
     "metadata": {
-       "name": "rr-mesh"
+      "name": "rr-mesh"
     },
     "spec": {
-       "nodeSelector": "has(i-am-a-route-reflector)",
+      "nodeSelector": "has(i-am-a-route-reflector)",
-       "peerSelector": "has(i-am-a-route-reflector)"
+      "peerSelector": "has(i-am-a-route-reflector)"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
   register: output
   retries: 4
@@ -315,13 +315,13 @@
     "apiVersion": "projectcalico.org/v3",
     "kind": "Node",
     "metadata": {
-       "name": "{{ inventory_hostname }}"
+      "name": "{{ inventory_hostname }}"
     },
     "spec": {
-       "bgp": {
+      "bgp": {
-         "asNumber": "{{ local_as }}"
+        "asNumber": "{{ local_as }}"
-       },
+      },
-       "orchRefs":[{"nodeName":"{{ inventory_hostname }}","orchestrator":"k8s"}]
+      "orchRefs":[{"nodeName":"{{ inventory_hostname }}","orchestrator":"k8s"}]
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
   register: output
   retries: 4
@@ -339,12 +339,12 @@
     "apiVersion": "projectcalico.org/v3",
     "kind": "BGPPeer",
     "metadata": {
-       "name": "{{ inventory_hostname }}-{{ item.router_id }}"
+      "name": "{{ inventory_hostname }}-{{ item.router_id }}"
     },
     "spec": {
-       "asNumber": "{{ item.as }}",
+      "asNumber": "{{ item.as }}",
-       "node": "{{ inventory_hostname }}",
+      "node": "{{ inventory_hostname }}",
-       "peerIP": "{{ item.router_id }}"
+      "peerIP": "{{ item.router_id }}"
     }}' | {{ bin_dir }}/calicoctl.sh apply -f -
   register: output
   retries: 4

roles/network_plugin/calico/templates/calico-node.yml.j2

@@ -368,10 +368,10 @@ spec:
           secret:
             secretName: typha-client
             items:
-               - key: tls.crt
+                - key: tls.crt
-                 path: typha-client.crt
+                  path: typha-client.crt
-               - key: tls.key
+                - key: tls.key
-                 path: typha-client.key
+                  path: typha-client.key
         - name: typha-cacert
           hostPath:
             path: "/etc/kubernetes/ssl/"

roles/network_plugin/calico/templates/calico-typha.yml.j2

@@ -145,17 +145,17 @@ spec:
           periodSeconds: 10
 {% if typha_secure %}
       volumes:
-         - name: typha-server
+        - name: typha-server
-           secret:
+          secret:
-             secretName: typha-server
+            secretName: typha-server
-             items:
+            items:
-                - key: tls.crt
+              - key: tls.crt
-                  path: server_certificate.pem
+                path: server_certificate.pem
-                - key: tls.key
+              - key: tls.key
-                  path: server_key.pem
+                path: server_key.pem
-         - name: cacert
+        - name: cacert
-           hostPath:
+          hostPath:
-             path: "{{ kube_cert_dir }}"
+            path: "{{ kube_cert_dir }}"
 {% endif %}
 
 ---

roles/network_plugin/calico/templates/kdd-crds.yml.j2

@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-   name: felixconfigurations.crd.projectcalico.org
+  name: felixconfigurations.crd.projectcalico.org
 spec:
   scope: Cluster
   group: crd.projectcalico.org

roles/network_plugin/contiv/tasks/main.yml

@@ -146,9 +146,9 @@
 
 - name: Contiv | Copy netctl binary from docker container
   command: sh -c "{{ docker_bin_dir }}/docker rm -f netctl-binarycopy;
-           {{ docker_bin_dir }}/docker create --name netctl-binarycopy {{ contiv_image_repo }}:{{ contiv_image_tag }} &&
+          {{ docker_bin_dir }}/docker create --name netctl-binarycopy {{ contiv_image_repo }}:{{ contiv_image_tag }} &&
-           {{ docker_bin_dir }}/docker cp netctl-binarycopy:/contiv/bin/netctl {{ bin_dir }}/netctl &&
+          {{ docker_bin_dir }}/docker cp netctl-binarycopy:/contiv/bin/netctl {{ bin_dir }}/netctl &&
-           {{ docker_bin_dir }}/docker rm -f netctl-binarycopy"
+          {{ docker_bin_dir }}/docker rm -f netctl-binarycopy"
   register: contiv_task_result
   until: contiv_task_result.rc == 0
   retries: 4

roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2

@@ -29,15 +29,15 @@ spec:
         securityContext:
           privileged: true
         volumeMounts:
-         - mountPath: /etc/openvswitch
+          - mountPath: /etc/openvswitch
-           name: etc-openvswitch
+            name: etc-openvswitch
-           readOnly: false
+            readOnly: false
-         - mountPath: /var/run
+          - mountPath: /var/run
-           name: var-run
+            name: var-run
-           readOnly: false
+            readOnly: false
-         - mountPath: /opt/cni/bin
+          - mountPath: /opt/cni/bin
-           name: cni-bin-dir
+            name: cni-bin-dir
-           readOnly: false
+            readOnly: false
         readinessProbe:
           exec:
             command:

roles/network_plugin/contiv/templates/contiv-config.yml.j2

@@ -22,10 +22,10 @@ data:
     }
   contiv_k8s_config: |-
     {
-       "K8S_API_SERVER": "{{ kube_apiserver_endpoint_for_contiv }}",
+      "K8S_API_SERVER": "{{ kube_apiserver_endpoint_for_contiv }}",
-       "K8S_CA": "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
+      "K8S_CA": "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
-       "K8S_KEY": "",
+      "K8S_KEY": "",
-       "K8S_CERT": "",
+      "K8S_CERT": "",
-       "K8S_TOKEN": "",
+      "K8S_TOKEN": "",
-       "SVC_SUBNET": "{{ kube_service_addresses }}"
+      "SVC_SUBNET": "{{ kube_service_addresses }}"
     }

roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2

@@ -20,12 +20,12 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       hostPID: true
       affinity:
-       nodeAffinity:
+        nodeAffinity:
-         requiredDuringSchedulingIgnoredDuringExecution:
+          requiredDuringSchedulingIgnoredDuringExecution:
-           nodeSelectorTerms:
+            nodeSelectorTerms:
-           - matchExpressions:
+            - matchExpressions:
-             - key: node-role.kubernetes.io/master
+              - key: node-role.kubernetes.io/master
-               operator: DoesNotExist
+                operator: DoesNotExist
       containers:
         - name: contiv-etcd-proxy
           image: {{ contiv_etcd_image_repo }}:{{ contiv_etcd_image_tag }}

roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2

@@ -78,8 +78,8 @@ spec:
               value: kubernetes
             - name: CONTIV_NETPLUGIN_VTEP_IP
               valueFrom:
-                 fieldRef:
+                fieldRef:
-                    fieldPath: status.podIP
+                  fieldPath: status.podIP
             - name: CONTIV_NETPLUGIN_ETCD_ENDPOINTS
               valueFrom:
                 configMapKeyRef:

roles/network_plugin/contiv/templates/contiv-ovs.yml.j2

@@ -57,15 +57,15 @@ spec:
                 name: contiv-config
                 key: contiv_ovs_vswitchd_extra_flags
         volumeMounts:
-         - mountPath: /etc/openvswitch
+          - mountPath: /etc/openvswitch
-           name: etc-openvswitch
+            name: etc-openvswitch
-           readOnly: false
+            readOnly: false
-         - mountPath: /lib/modules
+          - mountPath: /lib/modules
-           name: lib-modules
+            name: lib-modules
-           readOnly: true
+            readOnly: true
-         - mountPath: /var/run
+          - mountPath: /var/run
-           name: var-run
+            name: var-run
-           readOnly: false
+            readOnly: false
       volumes:
         # Used by contiv-ovs
         - name: etc-openvswitch

roles/upgrade/pre-upgrade/tasks/main.yml

@@ -3,8 +3,8 @@
 # Node NotReady: type = ready, status = Unknown
 - name: See if node is in ready state
   shell: >-
-     {{ bin_dir }}/kubectl get node {{ inventory_hostname }}
+    {{ bin_dir }}/kubectl get node {{ inventory_hostname }}
-     -o jsonpath='{ range .status.conditions[?(@.type == "Ready")].status }{ @ }{ end }'
+    -o jsonpath='{ range .status.conditions[?(@.type == "Ready")].status }{ @ }{ end }'
   register: kubectl_node_ready
   delegate_to: "{{ groups['kube-master'][0] }}"
   failed_when: false
@@ -14,8 +14,8 @@
 # else unschedulable key doesn't exist
 - name: See if node is schedulable
   shell: >-
-     {{ bin_dir }}/kubectl get node {{ inventory_hostname }}
+    {{ bin_dir }}/kubectl get node {{ inventory_hostname }}
-     -o jsonpath='{ .spec.unschedulable }'
+    -o jsonpath='{ .spec.unschedulable }'
   register: kubectl_node_schedulable
   delegate_to: "{{ groups['kube-master'][0] }}"
   failed_when: false

tests/testcases/030_check-network.yml

@@ -51,13 +51,13 @@
 
   - name: Get hostnet pods
     command: "{{ bin_dir }}/kubectl get pods -n test -o
-             jsonpath='{range .items[?(.spec.hostNetwork)]}{.metadata.name} {.status.podIP} {.status.containerStatuses} {end}'"
+            jsonpath='{range .items[?(.spec.hostNetwork)]}{.metadata.name} {.status.podIP} {.status.containerStatuses} {end}'"
     register: hostnet_pods
     no_log: true
 
   - name: Get running pods
     command: "{{ bin_dir }}/kubectl get pods -n test -o
-             jsonpath='{range .items[?(.status.phase==\"Running\")]}{.metadata.name} {.status.podIP} {.status.containerStatuses} {end}'"
+            jsonpath='{range .items[?(.status.phase==\"Running\")]}{.metadata.name} {.status.podIP} {.status.containerStatuses} {end}'"
     register: running_pods
     no_log: true