mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-02 16:29:21 +00:00
Merge pull request #51070 from NickrenREN/ephemeral-storage-name
Automatic merge from submit-queue (batch tested with PRs 50489, 51070, 51011, 51022, 51141) Add ephemeral local storage resource name first Since finally decided the ephemeral local storage resource name, send this PR to add the resource name first, and then i will rebase all my PRs about local storage isolation **Special notes for your reviewer**: related to: #50818 **Release note**: ```release-note NONE ``` /assign @jingxu97
This commit is contained in:
commit
9b8cb7510a
@ -60,3 +60,10 @@ func (self *ResourceList) StorageOverlay() *resource.Quantity {
|
|||||||
}
|
}
|
||||||
return &resource.Quantity{}
|
return &resource.Quantity{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *ResourceList) StorageEphemeral() *resource.Quantity {
|
||||||
|
if val, ok := (*self)[ResourceEphemeralStorage]; ok {
|
||||||
|
return &val
|
||||||
|
}
|
||||||
|
return &resource.Quantity{}
|
||||||
|
}
|
||||||
|
@ -3173,9 +3173,11 @@ const (
|
|||||||
// Local Storage for scratch space, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
// Local Storage for scratch space, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
// The resource name for ResourceStorageScratch is alpha and it can change across releases.
|
// The resource name for ResourceStorageScratch is alpha and it can change across releases.
|
||||||
ResourceStorageScratch ResourceName = "storage.kubernetes.io/scratch"
|
ResourceStorageScratch ResourceName = "storage.kubernetes.io/scratch"
|
||||||
|
// Local ephemeral storage, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
// The resource name for ResourceEphemeralStorage is alpha and it can change across releases.
|
||||||
|
ResourceEphemeralStorage ResourceName = "ephemeral-storage"
|
||||||
// NVIDIA GPU, in devices. Alpha, might change: although fractional and allowing values >1, only one whole device per node is assigned.
|
// NVIDIA GPU, in devices. Alpha, might change: although fractional and allowing values >1, only one whole device per node is assigned.
|
||||||
ResourceNvidiaGPU ResourceName = "alpha.kubernetes.io/nvidia-gpu"
|
ResourceNvidiaGPU ResourceName = "alpha.kubernetes.io/nvidia-gpu"
|
||||||
// Number of Pods that may be running on this Node: see ResourcePods
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -3725,10 +3727,14 @@ const (
|
|||||||
ResourceRequestsMemory ResourceName = "requests.memory"
|
ResourceRequestsMemory ResourceName = "requests.memory"
|
||||||
// Storage request, in bytes
|
// Storage request, in bytes
|
||||||
ResourceRequestsStorage ResourceName = "requests.storage"
|
ResourceRequestsStorage ResourceName = "requests.storage"
|
||||||
|
// Local ephemeral storage request, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
ResourceRequestsEphemeralStorage ResourceName = "requests.ephemeral-storage"
|
||||||
// CPU limit, in cores. (500m = .5 cores)
|
// CPU limit, in cores. (500m = .5 cores)
|
||||||
ResourceLimitsCPU ResourceName = "limits.cpu"
|
ResourceLimitsCPU ResourceName = "limits.cpu"
|
||||||
// Memory limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
// Memory limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
ResourceLimitsMemory ResourceName = "limits.memory"
|
ResourceLimitsMemory ResourceName = "limits.memory"
|
||||||
|
// Local ephemeral storage limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
ResourceLimitsEphemeralStorage ResourceName = "limits.ephemeral-storage"
|
||||||
)
|
)
|
||||||
|
|
||||||
// A ResourceQuotaScope defines a filter that must match each object tracked by a quota
|
// A ResourceQuotaScope defines a filter that must match each object tracked by a quota
|
||||||
|
@ -61,3 +61,10 @@ func (self *ResourceList) StorageOverlay() *resource.Quantity {
|
|||||||
}
|
}
|
||||||
return &resource.Quantity{}
|
return &resource.Quantity{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (self *ResourceList) StorageEphemeral() *resource.Quantity {
|
||||||
|
if val, ok := (*self)[ResourceEphemeralStorage]; ok {
|
||||||
|
return &val
|
||||||
|
}
|
||||||
|
return &resource.Quantity{}
|
||||||
|
}
|
||||||
|
@ -3602,9 +3602,11 @@ const (
|
|||||||
// Local Storage for scratch space, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
// Local Storage for scratch space, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
// The resource name for ResourceStorageScratch is alpha and it can change across releases.
|
// The resource name for ResourceStorageScratch is alpha and it can change across releases.
|
||||||
ResourceStorageScratch ResourceName = "storage.kubernetes.io/scratch"
|
ResourceStorageScratch ResourceName = "storage.kubernetes.io/scratch"
|
||||||
|
// Local ephemeral storage, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
// The resource name for ResourceEphemeralStorage is alpha and it can change across releases.
|
||||||
|
ResourceEphemeralStorage ResourceName = "ephemeral-storage"
|
||||||
// NVIDIA GPU, in devices. Alpha, might change: although fractional and allowing values >1, only one whole device per node is assigned.
|
// NVIDIA GPU, in devices. Alpha, might change: although fractional and allowing values >1, only one whole device per node is assigned.
|
||||||
ResourceNvidiaGPU ResourceName = "alpha.kubernetes.io/nvidia-gpu"
|
ResourceNvidiaGPU ResourceName = "alpha.kubernetes.io/nvidia-gpu"
|
||||||
// Number of Pods that may be running on this Node: see ResourcePods
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -4250,10 +4252,14 @@ const (
|
|||||||
ResourceRequestsMemory ResourceName = "requests.memory"
|
ResourceRequestsMemory ResourceName = "requests.memory"
|
||||||
// Storage request, in bytes
|
// Storage request, in bytes
|
||||||
ResourceRequestsStorage ResourceName = "requests.storage"
|
ResourceRequestsStorage ResourceName = "requests.storage"
|
||||||
|
// Local ephemeral storage request, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
ResourceRequestsEphemeralStorage ResourceName = "requests.ephemeral-storage"
|
||||||
// CPU limit, in cores. (500m = .5 cores)
|
// CPU limit, in cores. (500m = .5 cores)
|
||||||
ResourceLimitsCPU ResourceName = "limits.cpu"
|
ResourceLimitsCPU ResourceName = "limits.cpu"
|
||||||
// Memory limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
// Memory limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
ResourceLimitsMemory ResourceName = "limits.memory"
|
ResourceLimitsMemory ResourceName = "limits.memory"
|
||||||
|
// Local ephemeral storage limit, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024)
|
||||||
|
ResourceLimitsEphemeralStorage ResourceName = "limits.ephemeral-storage"
|
||||||
)
|
)
|
||||||
|
|
||||||
// A ResourceQuotaScope defines a filter that must match each object tracked by a quota
|
// A ResourceQuotaScope defines a filter that must match each object tracked by a quota
|
||||||
|
Loading…
Reference in New Issue
Block a user