From 50c6fa9171993b003a46816c16f01cdd5d592034 Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Sun, 27 Aug 2017 12:03:31 +0800 Subject: [PATCH] Remove previous local storage resource name 'scratch" and "overlay" --- pkg/api/resource.go | 7 ------- pkg/api/types.go | 6 ------ staging/src/k8s.io/api/core/v1/resource.go | 7 ------- staging/src/k8s.io/api/core/v1/types.go | 6 ------ 4 files changed, 26 deletions(-) diff --git a/pkg/api/resource.go b/pkg/api/resource.go index 415de84fb03..ce1747d8e6b 100644 --- a/pkg/api/resource.go +++ b/pkg/api/resource.go @@ -54,13 +54,6 @@ func (self *ResourceList) NvidiaGPU() *resource.Quantity { return &resource.Quantity{} } -func (self *ResourceList) StorageOverlay() *resource.Quantity { - if val, ok := (*self)[ResourceStorageOverlay]; ok { - return &val - } - return &resource.Quantity{} -} - func (self *ResourceList) StorageEphemeral() *resource.Quantity { if val, ok := (*self)[ResourceEphemeralStorage]; ok { return &val diff --git a/pkg/api/types.go b/pkg/api/types.go index 7359453dafc..55c5b100b75 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -3272,12 +3272,6 @@ const ( ResourceMemory ResourceName = "memory" // Volume size, in bytes (e,g. 5Gi = 5GiB = 5 * 1024 * 1024 * 1024) ResourceStorage ResourceName = "storage" - // Local Storage for overlay filesystem, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - // The resource name for ResourceStorageOverlay is alpha and it can change across releases. - ResourceStorageOverlay ResourceName = "storage.kubernetes.io/overlay" - // 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. - 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" diff --git a/staging/src/k8s.io/api/core/v1/resource.go b/staging/src/k8s.io/api/core/v1/resource.go index 08d1d3a3e69..3bd6fec62fa 100644 --- a/staging/src/k8s.io/api/core/v1/resource.go +++ b/staging/src/k8s.io/api/core/v1/resource.go @@ -55,13 +55,6 @@ func (self *ResourceList) NvidiaGPU() *resource.Quantity { return &resource.Quantity{} } -func (self *ResourceList) StorageOverlay() *resource.Quantity { - if val, ok := (*self)[ResourceStorageOverlay]; ok { - return &val - } - return &resource.Quantity{} -} - func (self *ResourceList) StorageEphemeral() *resource.Quantity { if val, ok := (*self)[ResourceEphemeralStorage]; ok { return &val diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index e5e58c0d84f..f9123d4e585 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -3699,12 +3699,6 @@ const ( ResourceMemory ResourceName = "memory" // Volume size, in bytes (e,g. 5Gi = 5GiB = 5 * 1024 * 1024 * 1024) ResourceStorage ResourceName = "storage" - // Local Storage for container overlay filesystem, in bytes. (500Gi = 500GiB = 500 * 1024 * 1024 * 1024) - // The resource name for ResourceStorageOverlay is alpha and it can change across releases. - ResourceStorageOverlay ResourceName = "storage.kubernetes.io/overlay" - // 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. - 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"