Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 9838bcb

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #49215 from rrati/aws-require-cluster-id
Automatic merge from submit-queue Make ClusterID required for AWS. **What this PR does / why we need it**: Makes ClusterID required for AWS and provides a flag to run in un-tagged mode fixes #48954 **Release note**: ```release-note A cluster using the AWS cloud provider will need to label existing nodes and resources with a ClusterID or the kube-controller-manager will not start. To run without a ClusterID pass --allow-untagged-cloud=true to the kube-controller-manager on startup. ```
2 parents a212b8d + 542b0b6 commit 9838bcb

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,11 @@ func (os *OpenStack) ScrubDNS(nameServers, searches []string) ([]string, []strin
458458
return nameServers, searches
459459
}
460460

461+
// HasClusterID returns true if the cluster has a clusterID
462+
func (os *OpenStack) HasClusterID() bool {
463+
return true
464+
}
465+
461466
func (os *OpenStack) LoadBalancer() (cloudprovider.LoadBalancer, bool) {
462467
glog.V(4).Info("openstack.LoadBalancer() called")
463468

0 commit comments

Comments
 (0)