Merge pull request kubernetes#92905 from andyzhangx/deprecate-blobdis

k8s-ci-robot · web-flow · commit 539b0a5a0f8c · 2020-07-12T06:59:07.000-07:00
doc: deprecate azure blob disk feature
diff --git a/pkg/volume/azure_dd/azure_common.go b/pkg/volume/azure_dd/azure_common.go
@@ -59,8 +59,8 @@ var (
 		string(api.AzureDataDiskCachingReadWrite))
 
 	supportedDiskKinds = sets.NewString(
-		string(api.AzureSharedBlobDisk),
-		string(api.AzureDedicatedBlobDisk),
+		string(api.AzureSharedBlobDisk),    // deprecated
+		string(api.AzureDedicatedBlobDisk), // deprecated
 		string(api.AzureManagedDisk))
 
 	// only for Windows node
diff --git a/pkg/volume/azure_dd/azure_provision.go b/pkg/volume/azure_dd/azure_provision.go
@@ -298,7 +298,7 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
 		if err != nil {
 			return nil, err
 		}
-	} else {
+	} else { // Attention: blob disk feature is deprecated
 		if kind == v1.AzureDedicatedBlobDisk {
 			_, diskURI, _, err = diskController.CreateVolume(name, account, storageAccountType, location, requestGiB)
 			if err != nil {
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go
@@ -40,6 +40,7 @@ import (
 	"k8s.io/klog/v2"
 )
 
+// Attention: blob disk feature is deprecated
 const (
 	vhdContainerName         = "vhds"
 	useHTTPSForBlobBasedDisk = true

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ func (p azureDiskProvisioner) Provision(selectedNode v1.Node, allowedTopologie`
`298`	`298`	`if err != nil {`
`299`	`299`	`return nil, err`
`300`	`300`	`}`
`301`		`- } else {`
	`301`	`+ } else { // Attention: blob disk feature is deprecated`
`302`	`302`	`if kind == v1.AzureDedicatedBlobDisk {`
`303`	`303`	`_, diskURI, _, err = diskController.CreateVolume(name, account, storageAccountType, location, requestGiB)`
`304`	`304`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ import (`
`40`	`40`	`"k8s.io/klog/v2"`
`41`	`41`	`)`
`42`	`42`
	`43`	`+// Attention: blob disk feature is deprecated`
`43`	`44`	`const (`
`44`	`45`	`vhdContainerName = "vhds"`
`45`	`46`	`useHTTPSForBlobBasedDisk = true`