github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

fix: update vm if detach a non-existing disk

Browse Source 
fix gofmt issue
This commit is contained in:
andyzhangx
2019-06-04 15:50:06 +00:00
parent 1409ff38e5
commit 91f97d2edd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package azure
import (
"fmt"
"net/http"
"strings"
@@ -132,7 +131,8 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
}
if !bFoundDisk {
return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI)
// only log here, next action is to update VM status with original meta data
klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI)
}
newVM := compute.VirtualMachine{

4
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package azure
import (
"fmt"
"net/http"
"strings"
@@ -136,7 +135,8 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
}
if !bFoundDisk {
return nil, fmt.Errorf("detach azure disk failure, disk %s not found, diskURI: %s", diskName, diskURI)
// only log here, next action is to update VM status with original meta data
klog.Errorf("detach azure disk: disk %s not found, diskURI: %s", diskName, diskURI)
}
newVM := compute.VirtualMachineScaleSetVM{