From ee1e9ec6a29bdd39693e217ecb7032b3b1493d18 Mon Sep 17 00:00:00 2001 From: MATSUMOTO TAKEAKI Date: Wed, 11 Mar 2020 17:33:35 +0900 Subject: [PATCH 1/2] [RKE driver] do not overwrite err on creation --- drivers/rke/rke_driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rke/rke_driver.go b/drivers/rke/rke_driver.go index b99e9c712..79adf2898 100644 --- a/drivers/rke/rke_driver.go +++ b/drivers/rke/rke_driver.go @@ -160,7 +160,7 @@ func (d *Driver) Create(ctx context.Context, opts *types.DriverOptions, info *ty dialers, externalFlags := d.getFlags(rkeConfig, stateDir) APIURL, caCrt, clientCert, clientKey, certs, err := clusterUp(ctx, &rkeConfig, dialers, externalFlags, data) if len(certs) > 0 { - certsStr, err = rkecerts.ToString(certs) + certsStr, _ = rkecerts.ToString(certs) } if err != nil && certsStr == "" { return d.save(&types.ClusterInfo{ From a8384d7c32632a2e8d1ab78e98d984b91087d60b Mon Sep 17 00:00:00 2001 From: MATSUMOTO TAKEAKI Date: Fri, 10 Apr 2020 19:00:32 +0900 Subject: [PATCH 2/2] always return nil if certsStr and API URL are not empty --- drivers/rke/rke_driver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/rke/rke_driver.go b/drivers/rke/rke_driver.go index 79adf2898..3ee447067 100644 --- a/drivers/rke/rke_driver.go +++ b/drivers/rke/rke_driver.go @@ -162,7 +162,7 @@ func (d *Driver) Create(ctx context.Context, opts *types.DriverOptions, info *ty if len(certs) > 0 { certsStr, _ = rkecerts.ToString(certs) } - if err != nil && certsStr == "" { + if err != nil && (certsStr == "" || APIURL == "") { return d.save(&types.ClusterInfo{ Metadata: map[string]string{ "Config": yaml, @@ -179,7 +179,7 @@ func (d *Driver) Create(ctx context.Context, opts *types.DriverOptions, info *ty "Config": yaml, "Certs": certsStr, }, - }, stateDir), err + }, stateDir), nil } func getData(s Store, k8sVersion string) (map[string]interface{}, error) {