rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-17 06:16:58 +00:00
Code Issues Releases Wiki Activity

Merge pull request #32 from galal-hussein/check_cluster_state

Browse Source 
Check if the cluster state is empty before upgrade
This commit is contained in:
Hussein Galal 2017-11-22 02:50:40 +02:00 committed by GitHub
commit 1e8d1cc8d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cluster.go
View File

@ -144,13 +144,17 @@ func ClusterUpgrade(clusterFile string) (string, string, string, string, error)
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
logrus.Debugf("Setting up upgrade tunnels")
if currentCluster == nil {
return APIURL, caCrt, clientCert, clientKey, fmt.Errorf("Failed to get the current state of Kubernetes cluster")
}
/* /*
kubeCluster is the cluster.yaml definition. It should have updated configuration kubeCluster is the cluster.yaml definition. It should have updated configuration
currentCluster is the current state fetched from kubernetes currentCluster is the current state fetched from kubernetes
we add currentCluster certs to kubeCluster, kubeCluster would have the latest configuration from cluster.yaml and the certs to connect to k8s and apply the upgrade we add currentCluster certs to kubeCluster, kubeCluster would have the latest configuration from cluster.yaml and the certs to connect to k8s and apply the upgrade
*/ */
kubeCluster.Certificates = currentCluster.Certificates kubeCluster.Certificates = currentCluster.Certificates
logrus.Debugf("Setting up upgrade tunnels")
err = kubeCluster.TunnelHosts() err = kubeCluster.TunnelHosts()
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err