project: fix double space at beginning/end of jinja

Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
kubernetes-sigs · Jun 30, 2023 · 408588e · 408588e
1 parent ca6d107
commit 408588e
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml
@@ -165,7 +165,7 @@ ndots: 2
 # Custom search domains to be added in addition to the default cluster search domains
 # searchdomains:
 #   - svc.{{ cluster_name }}
-#   - default.svc.{{ cluster_name  }}
+#   - default.svc.{{ cluster_name }}
 # Remove default cluster search domains (``default.svc.{{ dns_domain }}, svc.{{ dns_domain }}``).
 # remove_default_searchdomains: false
 # Can be coredns, coredns_dual, manual or none

diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
@@ -32,7 +32,7 @@
 
 - name: cri-o | build a list of crio runtimes with Katacontainers runtimes
   set_fact:
-    crio_runtimes: "{{ crio_runtimes + kata_runtimes  }}"
+    crio_runtimes: "{{ crio_runtimes + kata_runtimes }}"
   when:
     - kata_containers_enabled
 

diff --git a/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml b/roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml
@@ -5,9 +5,9 @@
 cinder_auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
 cinder_username: "{{ lookup('env', 'OS_USERNAME') }}"
 cinder_password: "{{ lookup('env', 'OS_PASSWORD') }}"
-cinder_application_credential_id: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_ID')  }}"
-cinder_application_credential_name: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_NAME')  }}"
-cinder_application_credential_secret: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_SECRET')  }}"
+cinder_application_credential_id: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_ID') }}"
+cinder_application_credential_name: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_NAME') }}"
+cinder_application_credential_secret: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_SECRET') }}"
 cinder_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
 cinder_tenant_id: "{{ lookup('env', 'OS_TENANT_ID') | default(lookup('env', 'OS_PROJECT_ID'),true) }}"
 cinder_tenant_name: "{{ lookup('env', 'OS_TENANT_NAME') | default(lookup('env', 'OS_PROJECT_NAME'),true) }}"

diff --git a/roles/kubernetes-apps/csi_driver/upcloud/defaults/main.yml b/roles/kubernetes-apps/csi_driver/upcloud/defaults/main.yml
@@ -5,8 +5,8 @@ upcloud_csi_attacher_image_tag: "v3.4.0"
 upcloud_csi_resizer_image_tag: "v1.4.0"
 upcloud_csi_plugin_image_tag: "v0.3.3"
 upcloud_csi_node_image_tag: "v2.5.0"
-upcloud_username: "{{ lookup('env', 'UPCLOUD_USERNAME')  }}"
-upcloud_password: "{{ lookup('env', 'UPCLOUD_PASSWORD')  }}"
+upcloud_username: "{{ lookup('env', 'UPCLOUD_USERNAME') }}"
+upcloud_password: "{{ lookup('env', 'UPCLOUD_PASSWORD') }}"
 upcloud_tolerations: []
 upcloud_csi_enable_volume_snapshot: false
 upcloud_csi_snapshot_controller_replicas: 2

diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml b/roles/kubernetes-apps/external_cloud_controller/openstack/defaults/main.yml
@@ -2,13 +2,13 @@
 # The external cloud controller will need credentials to access
 # openstack apis. Per default these values will be
 # read from the environment.
-external_openstack_auth_url: "{{ lookup('env', 'OS_AUTH_URL')  }}"
-external_openstack_username: "{{ lookup('env', 'OS_USERNAME')  }}"
-external_openstack_password: "{{ lookup('env', 'OS_PASSWORD')  }}"
-external_openstack_application_credential_id: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_ID')  }}"
-external_openstack_application_credential_name: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_NAME')  }}"
-external_openstack_application_credential_secret: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_SECRET')  }}"
-external_openstack_region: "{{ lookup('env', 'OS_REGION_NAME')  }}"
+external_openstack_auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
+external_openstack_username: "{{ lookup('env', 'OS_USERNAME') }}"
+external_openstack_password: "{{ lookup('env', 'OS_PASSWORD') }}"
+external_openstack_application_credential_id: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_ID') }}"
+external_openstack_application_credential_name: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_NAME') }}"
+external_openstack_application_credential_secret: "{{ lookup('env', 'OS_APPLICATION_CREDENTIAL_SECRET') }}"
+external_openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
 external_openstack_tenant_id: "{{ lookup('env', 'OS_TENANT_ID') | default(lookup('env', 'OS_PROJECT_ID'),true) }}"
 external_openstack_tenant_name: "{{ lookup('env', 'OS_TENANT_NAME') | default(lookup('env', 'OS_PROJECT_NAME'),true) }}"
 external_openstack_domain_name: "{{ lookup('env', 'OS_USER_DOMAIN_NAME') }}"

diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
@@ -161,10 +161,10 @@ sysctl_file_path: "/etc/sysctl.d/99-sysctl.conf"
 # For the openstack integration kubelet will need credentials to access
 # openstack apis like nova and cinder. Per default this values will be
 # read from the environment.
-openstack_auth_url: "{{ lookup('env', 'OS_AUTH_URL')  }}"
-openstack_username: "{{ lookup('env', 'OS_USERNAME')  }}"
-openstack_password: "{{ lookup('env', 'OS_PASSWORD')  }}"
-openstack_region: "{{ lookup('env', 'OS_REGION_NAME')  }}"
+openstack_auth_url: "{{ lookup('env', 'OS_AUTH_URL') }}"
+openstack_username: "{{ lookup('env', 'OS_USERNAME') }}"
+openstack_password: "{{ lookup('env', 'OS_PASSWORD') }}"
+openstack_region: "{{ lookup('env', 'OS_REGION_NAME') }}"
 openstack_tenant_id: "{{ lookup('env', 'OS_TENANT_ID') | default(lookup('env', 'OS_PROJECT_ID') | default(lookup('env', 'OS_PROJECT_NAME'),true),true) }}"
 openstack_tenant_name: "{{ lookup('env', 'OS_TENANT_NAME') }}"
 openstack_domain_name: "{{ lookup('env', 'OS_USER_DOMAIN_NAME') }}"

diff --git a/roles/network_plugin/multus/templates/multus-daemonset.yml.j2 b/roles/network_plugin/multus/templates/multus-daemonset.yml.j2
@@ -62,7 +62,7 @@ spec:
           mountPropagation: HostToContainer
 {% endif %}
         - name: cni
-          mountPath: {{  multus_cni_conf_dir }}
+          mountPath: {{ multus_cni_conf_dir }}
         - name: cnibin
           mountPath: {{ multus_cni_bin_dir }}
       volumes: