Revert "Change to alpha/beta for bandwidth annotations"

This reverts commit 2f4c3035be.
This commit is contained in:
Tim Hockin
2015-12-03 17:20:23 -08:00
parent 71f2d5ed4d
commit 29a2fded52
2 changed files with 11 additions and 11 deletions

View File

@@ -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",
},
},
},