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

Unify determination of whether a volume is ephemeral

Browse Source
This commit is contained in:
Shintaro Murakami 2021-03-05 14:25:51 +09:00
parent 96be00df69
commit fe7a862c2d
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/eviction/helpers.go
View File

@ -31,6 +31,7 @@ import (
v1resource "k8s.io/kubernetes/pkg/api/v1/resource" v1resource "k8s.io/kubernetes/pkg/api/v1/resource"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api" evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
volumeutils "k8s.io/kubernetes/pkg/volume/util"
) )
const ( const (
@ -343,9 +344,7 @@ func localVolumeNames(pod *v1.Pod) []string {
result := []string{} result := []string{}
for _, volume := range pod.Spec.Volumes { for _, volume := range pod.Spec.Volumes {
if volume.HostPath != nil || if volume.HostPath != nil ||
(volume.EmptyDir != nil && volume.EmptyDir.Medium != v1.StorageMediumMemory) || volumeutils.IsLocalEphemeralVolume(volume) {
volume.ConfigMap != nil ||
volume.GitRepo != nil {
result = append(result, volume.Name) result = append(result, volume.Name)
} }
} }

11
pkg/kubelet/server/stats/volume_stat_calculator.go
View File

@ -25,6 +25,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1" stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -122,7 +123,7 @@ func (s *volumeStatCalculator) calcAndStoreStats() {
} }
} }
volumeStats := s.parsePodVolumeStats(name, pvcRef, metric, volSpec) volumeStats := s.parsePodVolumeStats(name, pvcRef, metric, volSpec)
if isVolumeEphemeral(volSpec) { if util.IsLocalEphemeralVolume(volSpec) {
ephemeralStats = append(ephemeralStats, volumeStats) ephemeralStats = append(ephemeralStats, volumeStats)
} else { } else {
persistentStats = append(persistentStats, volumeStats) persistentStats = append(persistentStats, volumeStats)
@ -165,11 +166,3 @@ func (s *volumeStatCalculator) parsePodVolumeStats(podName string, pvcRef *stats
UsedBytes: &used, Inodes: &inodes, InodesFree: &inodesFree, InodesUsed: &inodesUsed}, UsedBytes: &used, Inodes: &inodes, InodesFree: &inodesFree, InodesUsed: &inodesUsed},
} }
} }
func isVolumeEphemeral(volume v1.Volume) bool {
if (volume.EmptyDir != nil && volume.EmptyDir.Medium == v1.StorageMediumDefault) ||
volume.ConfigMap != nil || volume.GitRepo != nil {
return true
}
return false
}

6
pkg/volume/util/util.go
View File

@ -583,10 +583,12 @@ func GetPluginMountDir(host volume.VolumeHost, name string) string {
// IsLocalEphemeralVolume determines whether the argument is a local ephemeral // IsLocalEphemeralVolume determines whether the argument is a local ephemeral
// volume vs. some other type // volume vs. some other type
// Local means the volume is using storage from the local disk that is managed by kubelet.
// Ephemeral means the lifecycle of the volume is the same as the Pod.
func IsLocalEphemeralVolume(volume v1.Volume) bool { func IsLocalEphemeralVolume(volume v1.Volume) bool {
return volume.GitRepo != nil || return volume.GitRepo != nil ||
(volume.EmptyDir != nil && volume.EmptyDir.Medium != v1.StorageMediumMemory) || (volume.EmptyDir != nil && volume.EmptyDir.Medium == v1.StorageMediumDefault) ||
volume.ConfigMap != nil || volume.DownwardAPI != nil volume.ConfigMap != nil
} }
// GetPodVolumeNames returns names of volumes that are used in a pod, // GetPodVolumeNames returns names of volumes that are used in a pod,