Merge pull request #231 from dougsland/release-4.13

OCPBUGS-11138: fix isUpgradeStillRunning()

pkg/config/node.go

@@ -271,7 +271,7 @@ func IsTheSameConfig(nodes []v1.Node) bool {
 //   - kubeconfigPath as string
 //
 // Returns:
-//   - true (same config), false or error
+//   - true (different config - upgrade still running), false (upgrade complete) or error
 func IsUpgradeStillRunning(kubeconfigPath string) (bool, error) {
 	nodes, err := GetNodes(kubeconfigPath)
 	if err != nil {
@@ -281,15 +281,13 @@ func IsUpgradeStillRunning(kubeconfigPath string) (bool, error) {
 	// Go to all node types identified in GetNodes()
 	for nodeRole := range nodes {
 		nodesConfigs := IsTheSameConfig(nodes[nodeRole])
-		if err != nil {
-			return false, err
-		}
 
-		if nodesConfigs {
-			return false, nil
+		if !nodesConfigs {
+			// at least one node group config is different
+			return true, nil
 		}
 	}
-	return true, nil
+	return false, nil
 }
 
 func GetIngressConfig(kubeconfigPath string, vips []string) (IngressConfig, error) {