Merge pull request #16331 from rrati/require-cluster-id-3.7

Automatic merge from submit-queue (batch tested with PRs 16443, 16331)

Require cluster id for AWS

Backporting of:

kubernetes/kubernetes#48612
kubernetes/kubernetes#49215

Plus changes in master-controller startup to look for the flag to allow untagged clouds or exit.

Author: openshift-merge-robot

pkg/cmd/server/kubernetes/master/master_config.go

@@ -384,6 +384,13 @@ func BuildControllerManagerServer(masterConfig configapi.MasterConfig) (*cmapp.C
 		return nil, nil, err
 	}
 	if cloud != nil {
+		if cloud.HasClusterID() == false {
+			if cmserver.AllowUntaggedCloud == true {
+				glog.Warning("detected a cluster without a ClusterID.  A ClusterID will be required in the future.  Please tag your cluster to avoid any future issues")
+			} else {
+				return nil, nil, fmt.Errorf("no ClusterID Found.  A ClusterID is required for the cloud provider to function properly.  This check can be bypassed by setting the allow-untagged-cloud option")
+			}
+		}
 		glog.V(2).Infof("Successfully initialized cloud provider: %q from the config file: %q\n", cmserver.CloudProvider, cmserver.CloudConfigFile)
 	}