diff --git a/cloud/linode/client/client.go b/cloud/linode/client/client.go index ca2efe2d..65535140 100644 --- a/cloud/linode/client/client.go +++ b/cloud/linode/client/client.go @@ -20,6 +20,7 @@ import ( const ( // DefaultClientTimeout is the default timeout for a client Linode API call DefaultClientTimeout = 120 * time.Second + DefaultLinodeAPIURL = "https://api.linode.com" ) type Client interface { @@ -71,6 +72,9 @@ var _ Client = (*linodego.Client)(nil) func New(token string, timeout time.Duration) (*linodego.Client, error) { userAgent := fmt.Sprintf("linode-cloud-controller-manager %s", linodego.DefaultUserAgent) apiURL := os.Getenv("LINODE_URL") + if apiURL == "" { + apiURL = DefaultLinodeAPIURL + } linodeClient := linodego.NewClient(&http.Client{Timeout: timeout}) client, err := linodeClient.UseURL(apiURL) diff --git a/cloud/linode/cloud_test.go b/cloud/linode/cloud_test.go index b335b939..d35b7d2d 100644 --- a/cloud/linode/cloud_test.go +++ b/cloud/linode/cloud_test.go @@ -20,7 +20,6 @@ func TestNewCloudRouteControllerDisabled(t *testing.T) { t.Setenv("LINODE_API_TOKEN", "dummyapitoken") t.Setenv("LINODE_REGION", "us-east") t.Setenv("LINODE_REQUEST_TIMEOUT_SECONDS", "10") - t.Setenv("LINODE_URL", "https://api.linode.com/v4") Options.NodeBalancerPrefix = "ccm" t.Run("should not fail if vpc is empty and routecontroller is disabled", func(t *testing.T) {