From 29a2fded52d5e93a1d9fa50ba6c03dc73468d99a Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Thu, 3 Dec 2015 17:20:23 -0800 Subject: [PATCH] Revert "Change to alpha/beta for bandwidth annotations" This reverts commit 2f4c3035be6a4188c12e8c45f5c6fe7f1a94fa38. --- pkg/kubelet/kubelet.go | 4 ++-- pkg/kubelet/kubelet_test.go | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 4f9a11ca69837..dec5479622c64 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -3295,7 +3295,7 @@ func validateBandwidthIsReasonable(rsrc *resource.Quantity) error { } func extractBandwidthResources(pod *api.Pod) (ingress, egress *resource.Quantity, err error) { - str, found := pod.Annotations["net.alpha.kubernetes.io/ingress-bandwidth"] + str, found := pod.Annotations["kubernetes.io/ingress-bandwidth"] if found { if ingress, err = resource.ParseQuantity(str); err != nil { return nil, nil, err @@ -3304,7 +3304,7 @@ func extractBandwidthResources(pod *api.Pod) (ingress, egress *resource.Quantity return nil, nil, err } } - str, found = pod.Annotations["net.alpha.kubernetes.io/egress-bandwidth"] + str, found = pod.Annotations["kubernetes.io/egress-bandwidth"] if found { if egress, err = resource.ParseQuantity(str); err != nil { return nil, nil, err diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 38114a578b765..9fe534a269ba3 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -4014,7 +4014,7 @@ func TestCleanupBandwidthLimits(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "foo", Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "10M", + "kubernetes.io/ingress-bandwidth": "10M", }, }, }, @@ -4039,7 +4039,7 @@ func TestCleanupBandwidthLimits(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "foo", Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "10M", + "kubernetes.io/ingress-bandwidth": "10M", }, }, }, @@ -4065,7 +4065,7 @@ func TestCleanupBandwidthLimits(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "foo", Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "10M", + "kubernetes.io/ingress-bandwidth": "10M", }, }, }, @@ -4090,7 +4090,7 @@ func TestCleanupBandwidthLimits(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "foo", Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "10M", + "kubernetes.io/ingress-bandwidth": "10M", }, }, }, @@ -4178,7 +4178,7 @@ func TestExtractBandwidthResources(t *testing.T) { pod: &api.Pod{ ObjectMeta: api.ObjectMeta{ Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "10M", + "kubernetes.io/ingress-bandwidth": "10M", }, }, }, @@ -4188,7 +4188,7 @@ func TestExtractBandwidthResources(t *testing.T) { pod: &api.Pod{ ObjectMeta: api.ObjectMeta{ Annotations: map[string]string{ - "net.alpha.kubernetes.io/egress-bandwidth": "10M", + "kubernetes.io/egress-bandwidth": "10M", }, }, }, @@ -4198,8 +4198,8 @@ func TestExtractBandwidthResources(t *testing.T) { pod: &api.Pod{ ObjectMeta: api.ObjectMeta{ Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "4M", - "net.alpha.kubernetes.io/egress-bandwidth": "20M", + "kubernetes.io/ingress-bandwidth": "4M", + "kubernetes.io/egress-bandwidth": "20M", }, }, }, @@ -4210,7 +4210,7 @@ func TestExtractBandwidthResources(t *testing.T) { pod: &api.Pod{ ObjectMeta: api.ObjectMeta{ Annotations: map[string]string{ - "net.alpha.kubernetes.io/ingress-bandwidth": "foo", + "kubernetes.io/ingress-bandwidth": "foo", }, }, },