diff --git a/pkg/kubeapiserver/options/cloudprovider.go b/pkg/kubeapiserver/options/cloudprovider.go
index 1e3f8a8c7dd..db98a810df9 100644
--- a/pkg/kubeapiserver/options/cloudprovider.go
+++ b/pkg/kubeapiserver/options/cloudprovider.go
@@ -54,8 +54,7 @@ func (s *CloudProviderOptions) DefaultExternalHost(genericoptions *genericoption
 		return nil
 	}
 
-	// TODO: extend for other providers
-	if s.CloudProvider == "gce" || s.CloudProvider == "aws" {
+	if cloudprovider.IsCloudProvider(s.CloudProvider) {
 		cloud, err := cloudprovider.InitCloudProvider(s.CloudProvider, s.CloudConfigFile)
 		if err != nil {
 			return fmt.Errorf("%q cloud provider could not be initialized: %v", s.CloudProvider, err)