Skip to content

Commit d89e37b

Browse files
committed
Release 1.30.0
1 parent 7499da7 commit d89e37b

30 files changed

+148
-1811
lines changed

pkg/cloudprovider/providers/oci/instances.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ func (cp *CloudProvider) checkForAuthorizationError(ctx context.Context, instanc
320320
return false, err
321321
}
322322
// to eliminate AD specific issues, list all ADs and make AD specific requests
323-
availabilityDomains, err := cp.client.Identity().ListAvailabilityDomains(ctx, compartmentId)
323+
availabilityDomains, err := cp.client.Identity(nil).ListAvailabilityDomains(ctx, compartmentId)
324324
for _, availabilityDomain := range availabilityDomains {
325325
instances, err := cp.client.Compute().ListInstancesByCompartmentAndAD(ctx, compartmentId, *availabilityDomain.Name)
326326
// if we are getting errors for ListInstances the issue can be authorization or other issues

pkg/oci/client/client_factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"go.uber.org/zap"
2020
)
2121

22-
//GetClient returns the client for given Configuration
22+
// GetClient returns the client for given Configuration
2323
func GetClient(logger *zap.SugaredLogger, cfg *config.Config) (Interface, error) {
2424
cp, err := config.NewConfigurationProvider(cfg)
2525
if err != nil {
@@ -29,6 +29,6 @@ func GetClient(logger *zap.SugaredLogger, cfg *config.Config) (Interface, error)
2929

3030
rateLimiter := NewRateLimiter(logger, cfg.RateLimiter)
3131

32-
c, err := New(logger, cp, &rateLimiter)
32+
c, err := New(logger, cp, &rateLimiter, cfg.Auth.TenancyID)
3333
return c, err
3434
}

pkg/oci/client/identity.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,24 @@ import (
2828
// by the volume provisioner.
2929
type IdentityInterface interface {
3030
GetAvailabilityDomainByName(ctx context.Context, compartmentID, name string) (*identity.AvailabilityDomain, error)
31+
ListAvailabilityDomains(ctx context.Context, compartmentID string) ([]identity.AvailabilityDomain, error)
32+
}
33+
34+
func (c *client) ListAvailabilityDomains(ctx context.Context, compartmentID string) ([]identity.AvailabilityDomain, error) {
35+
if !c.rateLimiter.Reader.TryAccept() {
36+
return nil, RateLimitError(false, "ListAvailabilityDomains")
37+
}
38+
39+
resp, err := c.identity.ListAvailabilityDomains(ctx, identity.ListAvailabilityDomainsRequest{
40+
CompartmentId: &compartmentID,
41+
RequestMetadata: c.requestMetadata,
42+
})
43+
incRequestCounter(err, listVerb, availabilityDomainResource)
44+
if err != nil {
45+
return nil, errors.WithStack(err)
46+
}
47+
48+
return resp.Items, nil
3149
}
3250

3351
func (c *client) GetAvailabilityDomainByName(ctx context.Context, compartmentID, name string) (*identity.AvailabilityDomain, error) {

pkg/volume/provisioner/core/provisioner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func NewOCIProvisioner(logger *zap.SugaredLogger, kubeClient kubernetes.Interfac
124124

125125
rateLimiter := client.NewRateLimiter(logger, cfg.RateLimiter)
126126

127-
client, err := client.New(logger, cp, &rateLimiter)
127+
client, err := client.New(logger, cp, &rateLimiter, cfg.Auth.TenancyID)
128128
if err != nil {
129129
return nil, errors.Wrapf(err, "unable to construct OCI client")
130130
}

vendor/github.com/oracle/oci-go-sdk/v65/common/auth/federation_client.go

Lines changed: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/common/circuit_breaker.go

Lines changed: 26 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/common/regions.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/common/regions.json

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/common/version.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/oracle/oci-go-sdk/v65/containerengine/install_addon_details.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)