Add .editorconfig file (#6307)

2026-02-28 09:39:12 +03:00 · 2020-06-29 21:39:59 +02:00
parent 09b23f96d7
commit 4c1e0b188d
67 changed files with 232 additions and 217 deletions
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/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 }}",
-       "peerIP": "{{ item.router_id }}"
+      "asNumber": "{{ item.as }}",
+      "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)",
-       "peerSelector": "has(i-am-a-route-reflector)"
+      "nodeSelector": "!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)",
-       "peerSelector": "has(i-am-a-route-reflector)"
+      "nodeSelector": "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": {
-         "asNumber": "{{ local_as }}"
-       },
-       "orchRefs":[{"nodeName":"{{ inventory_hostname }}","orchestrator":"k8s"}]
+      "bgp": {
+        "asNumber": "{{ local_as }}"
+      },
+      "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 }}",
-       "node": "{{ inventory_hostname }}",
-       "peerIP": "{{ item.router_id }}"
+      "asNumber": "{{ item.as }}",
+      "node": "{{ inventory_hostname }}",
+      "peerIP": "{{ item.router_id }}"
    }}' | {{ bin_dir }}/calicoctl.sh apply -f -
  register: output
  retries: 4
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -368,10 +368,10 @@ spec:
          secret:
            secretName: typha-client
            items:
-               - key: tls.crt
-                 path: typha-client.crt
-               - key: tls.key
-                 path: typha-client.key
+                - key: tls.crt
+                  path: typha-client.crt
+                - key: tls.key
+                  path: typha-client.key
        - name: typha-cacert
          hostPath:
            path: "/etc/kubernetes/ssl/"
--- a/roles/network_plugin/calico/templates/calico-typha.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2
@@ -145,17 +145,17 @@ spec:
          periodSeconds: 10
 {% if typha_secure %}
      volumes:
-         - name: typha-server
-           secret:
-             secretName: typha-server
-             items:
-                - key: tls.crt
-                  path: server_certificate.pem
-                - key: tls.key
-                  path: server_key.pem
-         - name: cacert
-           hostPath:
-             path: "{{ kube_cert_dir }}"
+        - name: typha-server
+          secret:
+            secretName: typha-server
+            items:
+              - key: tls.crt
+                path: server_certificate.pem
+              - key: tls.key
+                path: server_key.pem
+        - name: cacert
+          hostPath:
+            path: "{{ kube_cert_dir }}"
 {% endif %}

 ---
--- a/roles/network_plugin/calico/templates/kdd-crds.yml.j2
+++ b/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
--- a/roles/network_plugin/contiv/tasks/main.yml
+++ b/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 cp netctl-binarycopy:/contiv/bin/netctl {{ bin_dir }}/netctl &&
-           {{ 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 cp netctl-binarycopy:/contiv/bin/netctl {{ bin_dir }}/netctl &&
+          {{ docker_bin_dir }}/docker rm -f netctl-binarycopy"
  register: contiv_task_result
  until: contiv_task_result.rc == 0
  retries: 4
--- a/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-cleanup.yml.j2
@@ -29,15 +29,15 @@ spec:
        securityContext:
          privileged: true
        volumeMounts:
-         - mountPath: /etc/openvswitch
-           name: etc-openvswitch
-           readOnly: false
-         - mountPath: /var/run
-           name: var-run
-           readOnly: false
-         - mountPath: /opt/cni/bin
-           name: cni-bin-dir
-           readOnly: false
+          - mountPath: /etc/openvswitch
+            name: etc-openvswitch
+            readOnly: false
+          - mountPath: /var/run
+            name: var-run
+            readOnly: false
+          - mountPath: /opt/cni/bin
+            name: cni-bin-dir
+            readOnly: false
        readinessProbe:
          exec:
            command:
--- a/roles/network_plugin/contiv/templates/contiv-config.yml.j2
+++ b/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_CA": "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
-       "K8S_KEY": "",
-       "K8S_CERT": "",
-       "K8S_TOKEN": "",
-       "SVC_SUBNET": "{{ kube_service_addresses }}"
+      "K8S_API_SERVER": "{{ kube_apiserver_endpoint_for_contiv }}",
+      "K8S_CA": "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt",
+      "K8S_KEY": "",
+      "K8S_CERT": "",
+      "K8S_TOKEN": "",
+      "SVC_SUBNET": "{{ kube_service_addresses }}"
    }
--- a/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2
@@ -20,12 +20,12 @@ spec:
      dnsPolicy: ClusterFirstWithHostNet
      hostPID: true
      affinity:
-       nodeAffinity:
-         requiredDuringSchedulingIgnoredDuringExecution:
-           nodeSelectorTerms:
-           - matchExpressions:
-             - key: node-role.kubernetes.io/master
-               operator: DoesNotExist
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: DoesNotExist
      containers:
        - name: contiv-etcd-proxy
          image: {{ contiv_etcd_image_repo }}:{{ contiv_etcd_image_tag }}
--- a/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2
+++ b/roles/network_plugin/contiv/templates/contiv-netplugin.yml.j2
@@ -78,8 +78,8 @@ spec:
              value: kubernetes
            - name: CONTIV_NETPLUGIN_VTEP_IP
              valueFrom:
-                 fieldRef:
-                    fieldPath: status.podIP
+                fieldRef:
+                  fieldPath: status.podIP
            - name: CONTIV_NETPLUGIN_ETCD_ENDPOINTS
              valueFrom:
                configMapKeyRef:
--- a/roles/network_plugin/contiv/templates/contiv-ovs.yml.j2
+++ b/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
-           name: etc-openvswitch
-           readOnly: false
-         - mountPath: /lib/modules
-           name: lib-modules
-           readOnly: true
-         - mountPath: /var/run
-           name: var-run
-           readOnly: false
+          - mountPath: /etc/openvswitch
+            name: etc-openvswitch
+            readOnly: false
+          - mountPath: /lib/modules
+            name: lib-modules
+            readOnly: true
+          - mountPath: /var/run
+            name: var-run
+            readOnly: false
      volumes:
        # Used by contiv-ovs
        - name: etc-openvswitch
--- a/roles/network_plugin/kube-ovn/defaults/main.yml
+++ b/roles/network_plugin/kube-ovn/defaults/main.yml
@@ -13,4 +13,4 @@ kube_ovn_pinger_cpu_limit: 200m
 kube_ovn_pinger_memory_limit: 400Mi

 traffic_mirror: true
-encap_checksum: true
+encap_checksum: true
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
@@ -104,4 +104,4 @@ spec:
      JSONPath: .spec.providerInterfaceName
    - name: Subnet
      type: string
-      JSONPath: .spec.subnet
+      JSONPath: .spec.subnet
--- a/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-ovn.yml.j2
@@ -349,4 +349,4 @@ spec:
            path: /var/log/openvswitch
        - name: host-log-ovn
          hostPath:
-            path: /var/log/ovn
+            path: /var/log/ovn
--- a/roles/network_plugin/kube-router/defaults/main.yml
+++ b/roles/network_plugin/kube-router/defaults/main.yml
@@ -57,4 +57,4 @@ kube_router_enable_metrics: false
 kube_router_metrics_path: /metrics

 # Prometheus metrics port to use
-kube_router_metrics_port: 9255
+kube_router_metrics_port: 9255
--- a/roles/network_plugin/multus/files/multus-clusterrole.yml
+++ b/roles/network_plugin/multus/files/multus-clusterrole.yml
@@ -25,4 +25,4 @@ rules:
    verbs:
      - create
      - patch
-      - update
+      - update