fe26381c90
Here are a list of changes along with an explanation of how they work:
1. Add a new string field called TargetSelector to the external version of
extensions Scale type (extensions/v1beta1.Scale). This is a serialized
version of either the map-based selector (in case of ReplicationControllers)
or the unversioned.LabelSelector struct (in case of Deployments and
ReplicaSets).
2. Change the selector field in the internal Scale type (extensions.Scale) to
unversioned.LabelSelector.
3. Add conversion functions to convert from two external selector fields to a
single internal selector field. The rules for conversion are as follows:
i. If the target resource that this scale targets supports LabelSelector
(Deployments and ReplicaSets), then serialize the LabelSelector and
store the string in the TargetSelector field in the external version
and leave the map-based Selector field as nil.
ii. If the target resource only supports a map-based selector
(ReplicationControllers), then still serialize that selector and
store the serialized string in the TargetSelector field. Also,
set the the Selector map field in the external Scale type.
iii. When converting from external to internal version, parse the
TargetSelector string into LabelSelector struct if the string isn't
empty. If it is empty, then check if the Selector map is set and just
assign that map to the MatchLabels component of the LabelSelector.
iv. When converting from internal to external version, serialize the
LabelSelector and store it in the TargetSelector field. If only
the MatchLabel component is set, then also copy that value to
the Selector map field in the external version.
4. HPA now just converts the LabelSelector field to a Selector interface
type to list the pods.
5. Scale Get and Update etcd methods for Deployments and ReplicaSets now
return extensions.Scale instead of autoscaling.Scale.
6. Consequently, SubresourceGroupVersion override and is "autoscaling"
enabled check is now removed from pkg/master/master.go
7. Other small changes to labels package, fuzzer and LabelSelector
helpers to piece this all together.
8. Add unit tests to HPA targeting Deployments and ReplicaSets.
9. Add an e2e test to HPA targeting ReplicaSets.
84 lines
2.1 KiB
Go
84 lines
2.1 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package unversioned
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/pkg/labels"
|
|
)
|
|
|
|
func TestLabelSelectorAsSelector(t *testing.T) {
|
|
matchLabels := map[string]string{"foo": "bar"}
|
|
matchExpressions := []LabelSelectorRequirement{{
|
|
Key: "baz",
|
|
Operator: LabelSelectorOpIn,
|
|
Values: []string{"qux", "norf"},
|
|
}}
|
|
mustParse := func(s string) labels.Selector {
|
|
out, e := labels.Parse(s)
|
|
if e != nil {
|
|
panic(e)
|
|
}
|
|
return out
|
|
}
|
|
tc := []struct {
|
|
in *LabelSelector
|
|
out labels.Selector
|
|
expectErr bool
|
|
}{
|
|
{in: nil, out: labels.Nothing()},
|
|
{in: &LabelSelector{}, out: labels.Everything()},
|
|
{
|
|
in: &LabelSelector{MatchLabels: matchLabels},
|
|
out: mustParse("foo=bar"),
|
|
},
|
|
{
|
|
in: &LabelSelector{MatchExpressions: matchExpressions},
|
|
out: mustParse("baz in (norf,qux)"),
|
|
},
|
|
{
|
|
in: &LabelSelector{MatchLabels: matchLabels, MatchExpressions: matchExpressions},
|
|
out: mustParse("baz in (norf,qux),foo=bar"),
|
|
},
|
|
{
|
|
in: &LabelSelector{
|
|
MatchExpressions: []LabelSelectorRequirement{{
|
|
Key: "baz",
|
|
Operator: LabelSelectorOpExists,
|
|
Values: []string{"qux", "norf"},
|
|
}},
|
|
},
|
|
expectErr: true,
|
|
},
|
|
}
|
|
|
|
for i, tc := range tc {
|
|
out, err := LabelSelectorAsSelector(tc.in)
|
|
if err == nil && tc.expectErr {
|
|
t.Errorf("[%v]expected error but got none.", i)
|
|
}
|
|
if err != nil && !tc.expectErr {
|
|
t.Errorf("[%v]did not expect error but got: %v", i, err)
|
|
}
|
|
if !reflect.DeepEqual(out, tc.out) {
|
|
t.Errorf("[%v]expected:\n\t%+v\nbut got:\n\t%+v", i, tc.out, out)
|
|
}
|
|
}
|
|
}
|