From db17ba54b4163f71c3b4eeb17e445cd64cb3f364 Mon Sep 17 00:00:00 2001
From: Cedric Hnyda <cedric.hnyda@itera.io>
Date: Thu, 17 Dec 2020 17:23:09 +0100
Subject: [PATCH] Add cluster-name to
 external-openstack-cloud-controller-manager (#7055)

If cluster-name is not set, the default value "kubernetes" is used.
The loadbalancees created by Kubernetes follow the format:
  kube_service_clusterName_serviceNamespace_serviceName
If 2 clusters create a loadbalancer for the same service in the same
namespace, they will share the same non-working loadbalancer.

Signed-off-by: Cedric Hnyda <cedric.hnyda@itera.io>
---
 .../external-openstack-cloud-controller-manager-ds.yml.j2        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
index db33fcd9e..295ecee2d 100644
--- a/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
+++ b/roles/kubernetes-apps/external_cloud_controller/openstack/templates/external-openstack-cloud-controller-manager-ds.yml.j2
@@ -42,6 +42,7 @@ spec:
             - --v=1
             - --cloud-config=$(CLOUD_CONFIG)
             - --cloud-provider=openstack
+            - --cluster-name={{ cluster_name }}
             - --use-service-account-credentials=true
             - --address=127.0.0.1
 {% for key, value in external_openstack_cloud_controller_extra_args.items() %}
-- 
GitLab