github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121824 from carlory/clean-112

Browse Source 
adc remove stale comments
This commit is contained in:
Kubernetes Prow Robot 2024-01-29 14:13:17 -08:00 committed by GitHub
commit 0209c546fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go vendored
View File

@ -23,14 +23,13 @@ package cache
import ( import (
"fmt" "fmt"
"k8s.io/klog/v2"
"sync" "sync"
"time" "time"
"k8s.io/apimachinery/pkg/api/resource"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util" "k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/pkg/volume/util/operationexecutor" "k8s.io/kubernetes/pkg/volume/util/operationexecutor"
@ -64,9 +63,6 @@ type ActualStateOfWorld interface {
// SetVolumeMountedByNode sets the MountedByNode value for the given volume // SetVolumeMountedByNode sets the MountedByNode value for the given volume
// and node. When set to true the mounted parameter indicates the volume // and node. When set to true the mounted parameter indicates the volume
// is mounted by the given node, indicating it may not be safe to detach. // is mounted by the given node, indicating it may not be safe to detach.
// If the forceUnmount is set to true the MountedByNode value would be reset
// to false even it was not set yet (this is required during a controller
// crash recovery).
// If no volume with the name volumeName exists in the store, an error is // If no volume with the name volumeName exists in the store, an error is
// returned. // returned.
// If no node with the name nodeName exists in list of attached nodes for // If no node with the name nodeName exists in list of attached nodes for

2
pkg/controller/volume/attachdetach/reconciler/reconciler.go
View File

@ -191,7 +191,7 @@ func (rc *reconciler) reconcile(ctx context.Context) {
// Because the detach operation updates the ActualStateOfWorld before // Because the detach operation updates the ActualStateOfWorld before
// marking itself complete, it's possible for the volume to be removed // marking itself complete, it's possible for the volume to be removed
// from the ActualStateOfWorld between the GetAttachedVolumes() check // from the ActualStateOfWorld between the GetAttachedVolumes() check
// and the IsOperationPending() check above. // and the IsOperationSafeToRetry() check above.
// Check the ActualStateOfWorld again to avoid issuing an unnecessary // Check the ActualStateOfWorld again to avoid issuing an unnecessary
// detach. // detach.
// See https://github.com/kubernetes/kubernetes/issues/93902 // See https://github.com/kubernetes/kubernetes/issues/93902