github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Change to alpha/beta for bandwidth annotations"

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet.go
View File

@ -3295,7 +3295,7 @@ func validateBandwidthIsReasonable(rsrc *resource.Quantity) error {
} }
func extractBandwidthResources(pod *api.Pod) (ingress, egress *resource.Quantity, err 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 found {
if ingress, err = resource.ParseQuantity(str); err != nil { if ingress, err = resource.ParseQuantity(str); err != nil {
return nil, nil, err return nil, nil, err
@ -3304,7 +3304,7 @@ func extractBandwidthResources(pod *api.Pod) (ingress, egress *resource.Quantity
return nil, nil, err 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 found {
if egress, err = resource.ParseQuantity(str); err != nil { if egress, err = resource.ParseQuantity(str); err != nil {
return nil, nil, err return nil, nil, err

18
pkg/kubelet/kubelet_test.go
View File

@ -4014,7 +4014,7 @@ func TestCleanupBandwidthLimits(t *testing.T) {
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: "foo", Name: "foo",
Annotations: map[string]string{ 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{ ObjectMeta: api.ObjectMeta{
Name: "foo", Name: "foo",
Annotations: map[string]string{ 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{ ObjectMeta: api.ObjectMeta{
Name: "foo", Name: "foo",
Annotations: map[string]string{ 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{ ObjectMeta: api.ObjectMeta{
Name: "foo", Name: "foo",
Annotations: map[string]string{ 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{ pod: &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Annotations: map[string]string{ 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{ pod: &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Annotations: map[string]string{ 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{ pod: &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"net.alpha.kubernetes.io/ingress-bandwidth": "4M", "kubernetes.io/ingress-bandwidth": "4M",
"net.alpha.kubernetes.io/egress-bandwidth": "20M", "kubernetes.io/egress-bandwidth": "20M",
}, },
}, },
}, },
@ -4210,7 +4210,7 @@ func TestExtractBandwidthResources(t *testing.T) {
pod: &api.Pod{ pod: &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"net.alpha.kubernetes.io/ingress-bandwidth": "foo", "kubernetes.io/ingress-bandwidth": "foo",
}, },
}, },
}, },