Merge pull request kubernetes#18191 from thockin/ingress-egress-annot…

…ations Auto commit by PR queue bot
nikhiljindal · Dec 11, 2015 · caf4b1e · caf4b1e
2 parents 4e553f0 + 29a2fde
commit caf4b1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -3298,7 +3298,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
@@ -3307,7 +3307,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
@@ -3901,7 +3901,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",
 						},
 					},
 				},
@@ -3926,7 +3926,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",
 						},
 					},
 				},
@@ -3952,7 +3952,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",
 						},
 					},
 				},
@@ -3977,7 +3977,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 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",
 					},
 				},
 			},
@@ -4075,7 +4075,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",
 					},
 				},
 			},
@@ -4085,8 +4085,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",
 					},
 				},
 			},
@@ -4097,7 +4097,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",
 					},
 				},
 			},