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.
440 lines
15 KiB
Go
440 lines
15 KiB
Go
/*
|
|
Copyright 2015 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 v1beta1
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/api/unversioned"
|
|
v1 "k8s.io/kubernetes/pkg/api/v1"
|
|
"k8s.io/kubernetes/pkg/apis/extensions"
|
|
"k8s.io/kubernetes/pkg/conversion"
|
|
"k8s.io/kubernetes/pkg/runtime"
|
|
"k8s.io/kubernetes/pkg/util/intstr"
|
|
)
|
|
|
|
func addConversionFuncs(scheme *runtime.Scheme) {
|
|
// Add non-generated conversion functions
|
|
err := scheme.AddConversionFuncs(
|
|
Convert_api_PodSpec_To_v1_PodSpec,
|
|
Convert_v1_PodSpec_To_api_PodSpec,
|
|
Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus,
|
|
Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus,
|
|
Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec,
|
|
Convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec,
|
|
Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy,
|
|
Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy,
|
|
Convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment,
|
|
Convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment,
|
|
Convert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec,
|
|
Convert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec,
|
|
Convert_extensions_JobSpec_To_v1beta1_JobSpec,
|
|
Convert_v1beta1_JobSpec_To_extensions_JobSpec,
|
|
)
|
|
if err != nil {
|
|
// If one of the conversion functions is malformed, detect it immediately.
|
|
panic(err)
|
|
}
|
|
|
|
// Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
|
|
for _, kind := range []string{"DaemonSet", "Deployment", "Ingress"} {
|
|
err = api.Scheme.AddFieldLabelConversionFunc("extensions/v1beta1", kind,
|
|
func(label, value string) (string, string, error) {
|
|
switch label {
|
|
case "metadata.name", "metadata.namespace":
|
|
return label, value, nil
|
|
default:
|
|
return "", "", fmt.Errorf("field label %q not supported for %q", label, kind)
|
|
}
|
|
})
|
|
if err != nil {
|
|
// If one of the conversion functions is malformed, detect it immediately.
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
err = api.Scheme.AddFieldLabelConversionFunc("extensions/v1beta1", "Job",
|
|
func(label, value string) (string, string, error) {
|
|
switch label {
|
|
case "metadata.name", "metadata.namespace", "status.successful":
|
|
return label, value, nil
|
|
default:
|
|
return "", "", fmt.Errorf("field label not supported: %s", label)
|
|
}
|
|
})
|
|
if err != nil {
|
|
// If one of the conversion functions is malformed, detect it immediately.
|
|
panic(err)
|
|
}
|
|
}
|
|
|
|
// The following two PodSpec conversions functions where copied from pkg/api/conversion.go
|
|
// for the generated functions to work properly.
|
|
// This should be fixed: https://github.com/kubernetes/kubernetes/issues/12977
|
|
func Convert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *v1.PodSpec, s conversion.Scope) error {
|
|
return v1.Convert_api_PodSpec_To_v1_PodSpec(in, out, s)
|
|
}
|
|
|
|
func Convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conversion.Scope) error {
|
|
return v1.Convert_v1_PodSpec_To_api_PodSpec(in, out, s)
|
|
}
|
|
|
|
func Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.ScaleStatus))(in)
|
|
}
|
|
out.Replicas = int32(in.Replicas)
|
|
|
|
out.Selector = nil
|
|
out.TargetSelector = ""
|
|
if in.Selector != nil {
|
|
if in.Selector.MatchExpressions == nil || len(in.Selector.MatchExpressions) == 0 {
|
|
out.Selector = in.Selector.MatchLabels
|
|
}
|
|
|
|
selector, err := unversioned.LabelSelectorAsSelector(in.Selector)
|
|
if err != nil {
|
|
return fmt.Errorf("invalid label selector: %v", err)
|
|
}
|
|
out.TargetSelector = selector.String()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out *extensions.ScaleStatus, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*ScaleStatus))(in)
|
|
}
|
|
out.Replicas = int(in.Replicas)
|
|
|
|
// Normally when 2 fields map to the same internal value we favor the old field, since
|
|
// old clients can't be expected to know about new fields but clients that know about the
|
|
// new field can be expected to know about the old field (though that's not quite true, due
|
|
// to kubectl apply). However, these fields are readonly, so any non-nil value should work.
|
|
if in.TargetSelector != "" {
|
|
labelSelector, err := unversioned.ParseToLabelSelector(in.TargetSelector)
|
|
if err != nil {
|
|
out.Selector = nil
|
|
return fmt.Errorf("failed to parse target selector: %v", err)
|
|
}
|
|
out.Selector = labelSelector
|
|
} else if in.Selector != nil {
|
|
out.Selector = new(unversioned.LabelSelector)
|
|
selector := make(map[string]string)
|
|
for key, val := range in.Selector {
|
|
selector[key] = val
|
|
}
|
|
out.Selector.MatchLabels = selector
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.DeploymentSpec))(in)
|
|
}
|
|
out.Replicas = new(int32)
|
|
*out.Replicas = int32(in.Replicas)
|
|
if in.Selector != nil {
|
|
out.Selector = new(LabelSelector)
|
|
if err := Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
|
|
return err
|
|
}
|
|
if in.RevisionHistoryLimit != nil {
|
|
out.RevisionHistoryLimit = new(int32)
|
|
*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
|
|
}
|
|
out.MinReadySeconds = int32(in.MinReadySeconds)
|
|
out.Paused = in.Paused
|
|
if in.RollbackTo != nil {
|
|
out.RollbackTo = new(RollbackConfig)
|
|
out.RollbackTo.Revision = int64(in.RollbackTo.Revision)
|
|
} else {
|
|
out.RollbackTo = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*DeploymentSpec))(in)
|
|
}
|
|
if in.Replicas != nil {
|
|
out.Replicas = int(*in.Replicas)
|
|
}
|
|
|
|
if in.Selector != nil {
|
|
out.Selector = new(unversioned.LabelSelector)
|
|
if err := Convert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
|
|
return err
|
|
}
|
|
if in.RevisionHistoryLimit != nil {
|
|
out.RevisionHistoryLimit = new(int)
|
|
*out.RevisionHistoryLimit = int(*in.RevisionHistoryLimit)
|
|
}
|
|
out.MinReadySeconds = int(in.MinReadySeconds)
|
|
out.Paused = in.Paused
|
|
if in.RollbackTo != nil {
|
|
out.RollbackTo = new(extensions.RollbackConfig)
|
|
out.RollbackTo.Revision = in.RollbackTo.Revision
|
|
} else {
|
|
out.RollbackTo = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *extensions.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.DeploymentStrategy))(in)
|
|
}
|
|
out.Type = DeploymentStrategyType(in.Type)
|
|
if in.RollingUpdate != nil {
|
|
out.RollingUpdate = new(RollingUpdateDeployment)
|
|
if err := Convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.RollingUpdate = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(in *DeploymentStrategy, out *extensions.DeploymentStrategy, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*DeploymentStrategy))(in)
|
|
}
|
|
out.Type = extensions.DeploymentStrategyType(in.Type)
|
|
if in.RollingUpdate != nil {
|
|
out.RollingUpdate = new(extensions.RollingUpdateDeployment)
|
|
if err := Convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.RollingUpdate = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *extensions.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.RollingUpdateDeployment))(in)
|
|
}
|
|
if out.MaxUnavailable == nil {
|
|
out.MaxUnavailable = &intstr.IntOrString{}
|
|
}
|
|
if err := s.Convert(&in.MaxUnavailable, out.MaxUnavailable, 0); err != nil {
|
|
return err
|
|
}
|
|
if out.MaxSurge == nil {
|
|
out.MaxSurge = &intstr.IntOrString{}
|
|
}
|
|
if err := s.Convert(&in.MaxSurge, out.MaxSurge, 0); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *extensions.RollingUpdateDeployment, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*RollingUpdateDeployment))(in)
|
|
}
|
|
if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil {
|
|
return err
|
|
}
|
|
if err := s.Convert(in.MaxSurge, &out.MaxSurge, 0); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *ReplicaSetSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.ReplicaSetSpec))(in)
|
|
}
|
|
out.Replicas = new(int32)
|
|
*out.Replicas = int32(in.Replicas)
|
|
if in.Selector != nil {
|
|
out.Selector = new(LabelSelector)
|
|
if err := Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if in.Template != nil {
|
|
out.Template = new(v1.PodTemplateSpec)
|
|
if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in.Template, out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Template = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*ReplicaSetSpec))(in)
|
|
}
|
|
if in.Replicas != nil {
|
|
out.Replicas = int(*in.Replicas)
|
|
}
|
|
if in.Selector != nil {
|
|
out.Selector = new(unversioned.LabelSelector)
|
|
if err := Convert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if in.Template != nil {
|
|
out.Template = new(api.PodTemplateSpec)
|
|
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(in.Template, out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Template = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_JobSpec_To_v1beta1_JobSpec(in *extensions.JobSpec, out *JobSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*extensions.JobSpec))(in)
|
|
}
|
|
if in.Parallelism != nil {
|
|
out.Parallelism = new(int32)
|
|
*out.Parallelism = int32(*in.Parallelism)
|
|
} else {
|
|
out.Parallelism = nil
|
|
}
|
|
if in.Completions != nil {
|
|
out.Completions = new(int32)
|
|
*out.Completions = int32(*in.Completions)
|
|
} else {
|
|
out.Completions = nil
|
|
}
|
|
if in.ActiveDeadlineSeconds != nil {
|
|
out.ActiveDeadlineSeconds = new(int64)
|
|
*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
|
|
} else {
|
|
out.ActiveDeadlineSeconds = nil
|
|
}
|
|
// unable to generate simple pointer conversion for unversioned.LabelSelector -> v1beta1.LabelSelector
|
|
if in.Selector != nil {
|
|
out.Selector = new(LabelSelector)
|
|
if err := Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
|
|
// BEGIN non-standard conversion
|
|
// autoSelector has opposite meaning as manualSelector.
|
|
// in both cases, unset means false, and unset is always preferred to false.
|
|
// unset vs set-false distinction is not preserved.
|
|
manualSelector := in.ManualSelector != nil && *in.ManualSelector
|
|
autoSelector := !manualSelector
|
|
if autoSelector {
|
|
out.AutoSelector = new(bool)
|
|
*out.AutoSelector = true
|
|
} else {
|
|
out.AutoSelector = nil
|
|
}
|
|
// END non-standard conversion
|
|
|
|
if err := Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_JobSpec_To_extensions_JobSpec(in *JobSpec, out *extensions.JobSpec, s conversion.Scope) error {
|
|
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
|
|
defaulting.(func(*JobSpec))(in)
|
|
}
|
|
if in.Parallelism != nil {
|
|
out.Parallelism = new(int)
|
|
*out.Parallelism = int(*in.Parallelism)
|
|
} else {
|
|
out.Parallelism = nil
|
|
}
|
|
if in.Completions != nil {
|
|
out.Completions = new(int)
|
|
*out.Completions = int(*in.Completions)
|
|
} else {
|
|
out.Completions = nil
|
|
}
|
|
if in.ActiveDeadlineSeconds != nil {
|
|
out.ActiveDeadlineSeconds = new(int64)
|
|
*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
|
|
} else {
|
|
out.ActiveDeadlineSeconds = nil
|
|
}
|
|
// unable to generate simple pointer conversion for v1beta1.LabelSelector -> unversioned.LabelSelector
|
|
if in.Selector != nil {
|
|
out.Selector = new(unversioned.LabelSelector)
|
|
if err := Convert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in.Selector, out.Selector, s); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
|
|
// BEGIN non-standard conversion
|
|
// autoSelector has opposite meaning as manualSelector.
|
|
// in both cases, unset means false, and unset is always preferred to false.
|
|
// unset vs set-false distinction is not preserved.
|
|
autoSelector := bool(in.AutoSelector != nil && *in.AutoSelector)
|
|
manualSelector := !autoSelector
|
|
if manualSelector {
|
|
out.ManualSelector = new(bool)
|
|
*out.ManualSelector = true
|
|
} else {
|
|
out.ManualSelector = nil
|
|
}
|
|
// END non-standard conversion
|
|
|
|
if err := Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|