Skip to content

Commit

Permalink
Revert "Change to alpha/beta for bandwidth annotations"
Browse files Browse the repository at this point in the history 
This reverts commit 2f4c303.
  • Loading branch information
@thockin
thockin committed Dec 4, 2015
1 parent 71f2d5e commit 29a2fde
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions pkg/kubelet/kubelet_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand Down Expand Up @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand Down

1 comment on commit 29a2fde

@k8s-teamcity-mesosphere
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 8019 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 205 Build time: 00:04:53

Please sign in to comment.