Merge pull request oracle#115 in OKE/oci-cloud-controller-manager from fix/oc5-IMDS-lookup to internal

AkarshES · AkarshES · commit 33cc87346fb0 · 2021-01-27T12:39:51.000Z
* commit 'e02af62049505fef765ec720a5c990e0e78ef33d':
  Enable IMDS server lookup
diff --git a/pkg/cloudprovider/providers/oci/ccm.go b/pkg/cloudprovider/providers/oci/ccm.go
@@ -36,6 +36,7 @@ import (
 	"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/oci/instance/metadata"
+	"github.com/oracle/oci-go-sdk/v31/common"
 	"github.com/oracle/oci-go-sdk/v31/core"
 )
 
@@ -146,6 +147,7 @@ func init() {
 
 		return NewCloudProvider(cfg)
 	})
+	common.EnableInstanceMetadataServiceLookup()
 }
 
 // Initialize passes a Kubernetes clientBuilder interface to the cloud provider.

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ import (`
`36`	`36`	`"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"`
`37`	`37`	`"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"`
`38`	`38`	`"github.com/oracle/oci-cloud-controller-manager/pkg/oci/instance/metadata"`
	`39`	`+ "github.com/oracle/oci-go-sdk/v31/common"`
`39`	`40`	`"github.com/oracle/oci-go-sdk/v31/core"`
`40`	`41`	`)`
`41`	`42`
`@@ -146,6 +147,7 @@ func init() {`
`146`	`147`
`147`	`148`	`return NewCloudProvider(cfg)`
`148`	`149`	`})`
	`150`	`+ common.EnableInstanceMetadataServiceLookup()`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`// Initialize passes a Kubernetes clientBuilder interface to the cloud provider.`