1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-24 04:48:35 +00:00

Check if the cluster state is empty before upgrade

This commit is contained in:
galal-hussein
2017-11-21 22:44:16 +02:00
parent 7aa086ef1b
commit 650c57a4cb

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