Skip to content

Commit

Permalink
Merge pull request #2113 from MartinForReal/shafan/bumpazclient
Browse files Browse the repository at this point in the history 
Chore: bump azclient and fix signature update in new version
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot committed Dec 6, 2023
2 parents 23c3bff + e15c1b7 commit 8e04488
Show file tree
Hide file tree
Showing 19 changed files with 338 additions and 164 deletions.
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/kubernetes-csi/csi-lib-utils v0.15.0-rc0
github.com/kubernetes-csi/csi-proxy/client v1.1.3
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
github.com/onsi/ginkgo/v2 v2.13.1
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/pborman/uuid v1.2.1
github.com/pelletier/go-toml v1.9.5
Expand All @@ -39,8 +39,8 @@ require (
k8s.io/pod-security-admission v0.0.0
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231128114432-f80321a29d3a
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231128114432-f80321a29d3a
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231128114432-f80321a29d3a
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205172302-160a1ea0b460
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205172302-160a1ea0b460
sigs.k8s.io/yaml v1.4.0
)

Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxm
github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo=
github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM=
github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
Expand Down Expand Up @@ -821,10 +821,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6U
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231128114432-f80321a29d3a h1:e332VvGZflcYOgaFSi6uCCq+17518Mwe6HXG3mN8A4M=
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20231128114432-f80321a29d3a/go.mod h1:M36MFsCkzXOA4MYSGwemzBRDfjb29LT/rmOSs2qnUxc=
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231128114432-f80321a29d3a h1:k3ruyFIAxcCi0XvrdIXt6Xvbw/iiSoBh58tF1NZQ3Sk=
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231128114432-f80321a29d3a/go.mod h1:8F3Frjd9iJjzk9h2dmqG5DrgJ8+Ge48UvO075A8KNFc=
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231128114432-f80321a29d3a h1:o2EKmtfsv4U5r1g4hqlUva4+ZptO4YzopHCppVj7mho=
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231128114432-f80321a29d3a/go.mod h1:JY+50qlRnEpQGhcw8fem/o9E/Q8OvmWSJPov+SpxTXM=
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205172302-160a1ea0b460 h1:Bd/+haywvDF6/mpmB+EOZ7Y4ibC/kVDIMIJrS2UAj9A=
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205172302-160a1ea0b460/go.mod h1:dckGAqm0wUQNqqvCEeWhfXKL7DB/r9zchDq9xdcF/Qk=
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205172302-160a1ea0b460 h1:24TKUT7tRtjPxIG3KMl53zP4zTdJiI0bLWp4H1vPzAY=
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205172302-160a1ea0b460/go.mod h1:dDc0Ixf5VI01TkTj83ENW1hH5jImGJsdKhQgFRyQsyA=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
Expand Down
17 changes: 3 additions & 14 deletions test/utils/azure/azure_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import (
"os"
"time"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
compute "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5"
network "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4"
Expand All @@ -50,21 +48,12 @@ type Client struct {

func GetAzureClient(cloud, subscriptionID, clientID, tenantID, clientSecret string) (*Client, error) {
armConfig := &azclient.ARMClientConfig{
Cloud: cloud,
Cloud: cloud,
TenantID: tenantID,
}
cloudConfig, err := azclient.GetAzureCloudConfig(armConfig)
if err != nil {
return nil, err
}
credProvider, err := azclient.NewAuthProvider(azclient.AzureAuthConfig{
TenantID: tenantID,
credProvider, err := azclient.NewAuthProvider(armConfig, &azclient.AzureAuthConfig{
AADClientID: clientID,
AADClientSecret: clientSecret,
}, &arm.ClientOptions{
AuxiliaryTenants: []string{tenantID},
ClientOptions: policy.ClientOptions{
Cloud: *cloudConfig,
},
})
if err != nil {
return nil, err
Expand Down
6 changes: 6 additions & 0 deletions vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/github.com/onsi/ginkgo/v2/ginkgo/internal/test_suite.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/dependencies.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions vendor/github.com/onsi/ginkgo/v2/reporters/json_report.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/onsi/ginkgo/v2/types/code_location.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/onsi/ginkgo/v2/types/version.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ github.com/modern-go/reflect2
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
github.com/munnerz/goautoneg
# github.com/onsi/ginkgo/v2 v2.13.1
# github.com/onsi/ginkgo/v2 v2.13.2
## explicit; go 1.18
github.com/onsi/ginkgo/v2
github.com/onsi/ginkgo/v2/config
Expand Down Expand Up @@ -1553,7 +1553,7 @@ sigs.k8s.io/cloud-provider-azure/pkg/retry
sigs.k8s.io/cloud-provider-azure/pkg/util/deepcopy
sigs.k8s.io/cloud-provider-azure/pkg/util/taints
sigs.k8s.io/cloud-provider-azure/pkg/version
# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231128114432-f80321a29d3a
# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20231205172302-160a1ea0b460
## explicit; go 1.20
sigs.k8s.io/cloud-provider-azure/pkg/azclient
sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient
Expand Down Expand Up @@ -1591,7 +1591,7 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient
sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient
sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient
sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworkclient
# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231128114432-f80321a29d3a
# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.0-20231205172302-160a1ea0b460
## explicit; go 1.20
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader
# sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
Expand Down
38 changes: 24 additions & 14 deletions vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/arm_conf.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8e04488

Please sign in to comment.