From: Kiran Kamineni <kiran.k.kamineni@intel.com>
Date: Mon, 9 Dec 2019 23:20:46 +0000 (-0800)
Subject: Use http when not using tls
X-Git-Tag: 0.6.0~90
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F99368%2F1;p=multicloud%2Fk8s.git

Use http when not using tls

Issue-ID: MULTICLOUD-666
Change-Id: I8838fb2d312c841fd421d0a887bcfe181f6281e9
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
---

diff --git a/src/k8splugin/internal/db/etcd.go b/src/k8splugin/internal/db/etcd.go
index fda44b2f..97771a07 100644
--- a/src/k8splugin/internal/db/etcd.go
+++ b/src/k8splugin/internal/db/etcd.go
@@ -71,7 +71,12 @@ func newClient(store *clientv3.Client, c EtcdConfig) (EtcdClient, error) {
 		if len(c.CertFile) == 0 && len(c.KeyFile) == 0 && len(c.CAFile) == 0 {
 			tlsConfig = nil
 		}
-		endpoint := "https://" + c.Endpoint + ":2379"
+		endpoint := ""
+		if tlsConfig == nil {
+			endpoint = "http://" + c.Endpoint + ":2379"
+		} else {
+			endpoint = "https://" + c.Endpoint + ":2379"
+		}
 
 		store, err = clientv3.New(clientv3.Config{
 			Endpoints:   []string{endpoint},