Skip to content

Commit 32752fe

Browse files
committed
Add recommendation for using OnRootMismatch
1 parent 49dabe5 commit 32752fe

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pkg/volume/util/metrics.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"google.golang.org/grpc/status"
2626
"k8s.io/component-base/metrics"
2727
"k8s.io/component-base/metrics/legacyregistry"
28+
"k8s.io/klog/v2"
2829
"k8s.io/kubernetes/pkg/volume"
2930
"k8s.io/kubernetes/pkg/volume/util/types"
3031
)
@@ -102,6 +103,7 @@ func OperationCompleteHook(plugin, operationName string) func(types.CompleteFunc
102103
if c.Migrated != nil {
103104
migrated = *c.Migrated
104105
}
106+
klog.Infof("foobar Operation %s took %f", operationName, timeTaken)
105107
StorageOperationMetric.WithLabelValues(plugin, operationName, status, strconv.FormatBool(migrated)).Observe(timeTaken)
106108
}
107109
return opComplete

pkg/volume/volume_linux.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ func (vo *VolumeOwnership) changePermissionsRecursively() error {
121121
}
122122

123123
func (vo *VolumeOwnership) monitorProgress(ctx context.Context) {
124+
msg := fmt.Sprintf("Setting volume ownership for %s is taking longer than expected, consider using OnRootMismatch - https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#configure-volume-permission-and-ownership-change-policy-for-pods", vo.dir)
125+
vo.recorder.Event(vo.pod, v1.EventTypeWarning, events.VolumePermissionChangeInProgress, msg)
124126
ticker := time.NewTicker(progressReportDuration)
125127
defer ticker.Stop()
126128
for {
@@ -134,7 +136,7 @@ func (vo *VolumeOwnership) monitorProgress(ctx context.Context) {
134136
}
135137

136138
func (vo *VolumeOwnership) logWarning() {
137-
msg := fmt.Sprintf("Setting volume ownership for %s, processed %d files", vo.dir, vo.fileCounter.Load())
139+
msg := fmt.Sprintf("Setting volume ownership for %s, processed %d files.", vo.dir, vo.fileCounter.Load())
138140
klog.Warning(msg)
139141
vo.recorder.Event(vo.pod, v1.EventTypeWarning, events.VolumePermissionChangeInProgress, msg)
140142
}

0 commit comments

Comments
 (0)