diff --git a/Makefile b/Makefile index 280e84de4..0a91b7779 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ integration-test: blob .PHONY: e2e-test e2e-test: - if [ ! -z "$(EXTERNAL_E2E_TEST_BLOBFUSE)" ] || [ ! -z "$(EXTERNAL_E2E_TEST_NFS)" ]; then \ + if [ ! -z "$(EXTERNAL_E2E_TEST_BLOBFUSE)" ] || [ ! -z "$(EXTERNAL_E2E_TEST_BLOBFUSE_v2)" ] || [ ! -z "$(EXTERNAL_E2E_TEST_NFS)" ]; then \ bash ./test/external-e2e/run.sh;\ else \ go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS};\ diff --git a/go.mod b/go.mod index c33193a73..fbf25ef87 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( k8s.io/kubernetes v1.26.0 k8s.io/mount-utils v0.26.0 k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 - sigs.k8s.io/cloud-provider-azure v1.26.1-0.20221229055728-9863f3ea9b18 + sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230104031958-dcec04fff54c sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index bfe5f27ca..420ba77cb 100644 --- a/go.sum +++ b/go.sum @@ -850,8 +850,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 h1:LYqFq+6Cj2D0gFfrJvL7iElD4ET6ir3VDdhDdTK7rgc= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSNf2tZC7aMibXEqVhCd73GOY5fJikn8qbdzemB0= -sigs.k8s.io/cloud-provider-azure v1.26.1-0.20221229055728-9863f3ea9b18 h1:QM8faUevzsD24fKkc0AkivnRaRTf8chmmUkwlJa7urY= -sigs.k8s.io/cloud-provider-azure v1.26.1-0.20221229055728-9863f3ea9b18/go.mod h1:7ksoxa026xKQGAc0HYGk1ksucEweJnwxXiuk3krfP4c= +sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230104031958-dcec04fff54c h1:YaF4B4/vva8fbAsQHgIFCXwS49pBqpw6D1scQIU7ET8= +sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230104031958-dcec04fff54c/go.mod h1:7ksoxa026xKQGAc0HYGk1ksucEweJnwxXiuk3krfP4c= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh index f54b2ef65..6e4700ff4 100755 --- a/test/external-e2e/run.sh +++ b/test/external-e2e/run.sh @@ -37,6 +37,7 @@ setup_e2e_binaries() { # test on alternative driver name sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse.yaml + sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse2.yaml sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blob-nfs.yaml make e2e-bootstrap sed -i "s/csi-blob-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-blob-controller-svc.yaml diff --git a/vendor/modules.txt b/vendor/modules.txt index a42b60d26..c8f269fbb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1210,7 +1210,7 @@ k8s.io/utils/trace ## explicit; go 1.17 sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client -# sigs.k8s.io/cloud-provider-azure v1.26.1-0.20221229055728-9863f3ea9b18 +# sigs.k8s.io/cloud-provider-azure v1.26.1-0.20230104031958-dcec04fff54c ## explicit; go 1.19 sigs.k8s.io/cloud-provider-azure/pkg/auth sigs.k8s.io/cloud-provider-azure/pkg/azureclients @@ -1259,6 +1259,7 @@ sigs.k8s.io/cloud-provider-azure/pkg/consts sigs.k8s.io/cloud-provider-azure/pkg/metrics sigs.k8s.io/cloud-provider-azure/pkg/nodemanager sigs.k8s.io/cloud-provider-azure/pkg/provider +sigs.k8s.io/cloud-provider-azure/pkg/provider/config sigs.k8s.io/cloud-provider-azure/pkg/provider/virtualmachine sigs.k8s.io/cloud-provider-azure/pkg/retry sigs.k8s.io/cloud-provider-azure/pkg/util/deepcopy diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/azure_armclient.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/azure_armclient.go index 835a63b45..bc90e0c31 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/azure_armclient.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/azure_armclient.go @@ -75,7 +75,7 @@ func sender() autorest.Sender { Timeout: 30 * time.Second, // the same as default transport KeepAlive: 30 * time.Second, // the same as default transport }).DialContext, - ForceAttemptHTTP2: true, // always attempt HTTP/2 even though custom dialer is provided + ForceAttemptHTTP2: false, // respect custom dialer (default is true) MaxIdleConns: 100, // Zero means no limit, the same as default transport MaxIdleConnsPerHost: 100, // Default is 2, ref:https://cs.opensource.google/go/go/+/go1.18.4:src/net/http/transport.go;l=58 IdleConnTimeout: 90 * time.Second, // the same as default transport diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go index 93927f1ef..da736e55a 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go @@ -28,6 +28,8 @@ import ( "sync" "time" + ratelimitconfig "sigs.k8s.io/cloud-provider-azure/pkg/provider/config" + "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/adal" "github.com/Azure/go-autorest/autorest/azure" @@ -104,7 +106,7 @@ var ( // for more details. type Config struct { auth.AzureAuthConfig - CloudProviderRateLimitConfig + ratelimitconfig.CloudProviderRateLimitConfig // The cloud configure type for Azure cloud provider. Supported values are file, secret and merge. CloudConfigType cloudConfigType `json:"cloudConfigType,omitempty" yaml:"cloudConfigType,omitempty"` @@ -573,7 +575,7 @@ func (az *Cloud) InitializeCloudFromConfig(ctx context.Context, config *Config, } // Initialize rate limiting config options. - InitializeCloudProviderRateLimitConfig(&config.CloudProviderRateLimitConfig) + ratelimitconfig.InitializeCloudProviderRateLimitConfig(&config.CloudProviderRateLimitConfig) resourceRequestBackoff := az.setCloudProviderBackoffDefaults(config) @@ -997,8 +999,8 @@ func initDiskControllers(az *Cloud) error { // Common controller contains the function // needed by both blob disk and managed disk controllers - qps := float32(defaultAtachDetachDiskQPS) - bucket := defaultAtachDetachDiskBucket + qps := float32(ratelimitconfig.DefaultAtachDetachDiskQPS) + bucket := ratelimitconfig.DefaultAtachDetachDiskBucket if az.Config.AttachDetachDiskRateLimit != nil { qps = az.Config.AttachDetachDiskRateLimit.CloudProviderRateLimitQPSWrite bucket = az.Config.AttachDetachDiskRateLimit.CloudProviderRateLimitBucketWrite diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_ratelimit.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/config/azure_ratelimit.go similarity index 97% rename from vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_ratelimit.go rename to vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/config/azure_ratelimit.go index 5ffd566a0..9183142cd 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_ratelimit.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/config/azure_ratelimit.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package provider +package config import ( azclients "sigs.k8s.io/cloud-provider-azure/pkg/azureclients" @@ -22,8 +22,8 @@ import ( ) const ( - defaultAtachDetachDiskQPS = 6.0 - defaultAtachDetachDiskBucket = 10 + DefaultAtachDetachDiskQPS = 6.0 + DefaultAtachDetachDiskBucket = 10 ) // CloudProviderRateLimitConfig indicates the rate limit config for each clients. @@ -94,8 +94,8 @@ func InitializeCloudProviderRateLimitConfig(config *CloudProviderRateLimitConfig atachDetachDiskRateLimitConfig := azclients.RateLimitConfig{ CloudProviderRateLimit: true, - CloudProviderRateLimitQPSWrite: defaultAtachDetachDiskQPS, - CloudProviderRateLimitBucketWrite: defaultAtachDetachDiskBucket, + CloudProviderRateLimitQPSWrite: DefaultAtachDetachDiskQPS, + CloudProviderRateLimitBucketWrite: DefaultAtachDetachDiskBucket, } config.AttachDetachDiskRateLimit = overrideDefaultRateLimitConfig(&atachDetachDiskRateLimitConfig, config.AttachDetachDiskRateLimit) }