github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #105542 from pohly/generic-ephemeral-volume-util-kubelet

Browse Source 
kubelet: use generic ephemeral volume helper functions
This commit is contained in:
Kubernetes Prow Robot
2021-10-11 02:16:40 -07:00
committed by GitHub
parent 025ac2d57a 844662e7fa
commit 1f2813368e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet_pods.go
View File

@@ -39,6 +39,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilvalidation "k8s.io/apimachinery/pkg/util/validation"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/component-helpers/storage/ephemeral"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
"k8s.io/klog/v2" "k8s.io/klog/v2"
podutil "k8s.io/kubernetes/pkg/api/v1/pod" podutil "k8s.io/kubernetes/pkg/api/v1/pod"
@@ -2040,7 +2041,7 @@ func (kl *Kubelet) hasHostMountPVC(pod *v1.Pod) bool {
if !utilfeature.DefaultFeatureGate.Enabled(features.GenericEphemeralVolume) { if !utilfeature.DefaultFeatureGate.Enabled(features.GenericEphemeralVolume) {
continue continue
} }
pvcName = pod.Name + "-" + volume.Name pvcName = ephemeral.VolumeClaimName(pod, &volume)
default: default:
continue continue
} }