1b55f57391
Implements history utilities for ControllerRevision in the controller/history package StatefulSetStatus now has additional fields for consistency with DaemonSet and Deployment StatefulSetStatus.Replicas now represents the current number of createdPods and StatefulSetStatus.ReadyReplicas is the current number of ready Pods
342 lines
12 KiB
Go
342 lines
12 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
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"
|
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/conversion"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/util/intstr"
|
|
"k8s.io/kubernetes/pkg/api"
|
|
"k8s.io/kubernetes/pkg/api/v1"
|
|
"k8s.io/kubernetes/pkg/apis/apps"
|
|
"k8s.io/kubernetes/pkg/apis/extensions"
|
|
)
|
|
|
|
func addConversionFuncs(scheme *runtime.Scheme) error {
|
|
// Add non-generated conversion functions to handle the *int32 -> int32
|
|
// conversion. A pointer is useful in the versioned type so we can default
|
|
// it, but a plain int32 is more convenient in the internal type. These
|
|
// functions are the same as the autogenerated ones in every other way.
|
|
err := scheme.AddConversionFuncs(
|
|
Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec,
|
|
Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec,
|
|
Convert_v1beta1_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy,
|
|
Convert_apps_StatefulSetUpdateStrategy_To_v1beta1_StatefulSetUpdateStrategy,
|
|
// extensions
|
|
// TODO: below conversions should be dropped in favor of auto-generated
|
|
// ones, see https://github.com/kubernetes/kubernetextensionsssues/39865
|
|
Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus,
|
|
Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus,
|
|
Convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec,
|
|
Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec,
|
|
Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy,
|
|
Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy,
|
|
Convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment,
|
|
Convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
|
|
err = scheme.AddFieldLabelConversionFunc("apps/v1beta1", "StatefulSet",
|
|
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 for StatefulSet: %s", label)
|
|
}
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = scheme.AddFieldLabelConversionFunc("apps/v1beta1", "Deployment",
|
|
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 Deployment", label)
|
|
}
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
|
|
if in.Replicas != nil {
|
|
out.Replicas = *in.Replicas
|
|
}
|
|
if in.Selector != nil {
|
|
in, out := &in.Selector, &out.Selector
|
|
*out = new(metav1.LabelSelector)
|
|
if err := s.Convert(*in, *out, 0); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if err := s.Convert(&in.Template, &out.Template, 0); err != nil {
|
|
return err
|
|
}
|
|
if in.VolumeClaimTemplates != nil {
|
|
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
|
|
*out = make([]api.PersistentVolumeClaim, len(*in))
|
|
for i := range *in {
|
|
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
} else {
|
|
out.VolumeClaimTemplates = nil
|
|
}
|
|
if err := Convert_v1beta1_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
|
|
return err
|
|
}
|
|
if in.RevisionHistoryLimit != nil {
|
|
out.RevisionHistoryLimit = new(int32)
|
|
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
|
|
} else {
|
|
out.RevisionHistoryLimit = nil
|
|
}
|
|
out.ServiceName = in.ServiceName
|
|
out.PodManagementPolicy = apps.PodManagementPolicyType(in.PodManagementPolicy)
|
|
return nil
|
|
}
|
|
|
|
func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSetSpec, out *StatefulSetSpec, s conversion.Scope) error {
|
|
out.Replicas = new(int32)
|
|
*out.Replicas = in.Replicas
|
|
if in.Selector != nil {
|
|
in, out := &in.Selector, &out.Selector
|
|
*out = new(metav1.LabelSelector)
|
|
if err := s.Convert(*in, *out, 0); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
out.Selector = nil
|
|
}
|
|
if err := s.Convert(&in.Template, &out.Template, 0); err != nil {
|
|
return err
|
|
}
|
|
if in.VolumeClaimTemplates != nil {
|
|
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
|
|
*out = make([]v1.PersistentVolumeClaim, len(*in))
|
|
for i := range *in {
|
|
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
} else {
|
|
out.VolumeClaimTemplates = nil
|
|
}
|
|
if in.RevisionHistoryLimit != nil {
|
|
out.RevisionHistoryLimit = new(int32)
|
|
*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
|
|
} else {
|
|
out.RevisionHistoryLimit = nil
|
|
}
|
|
out.ServiceName = in.ServiceName
|
|
out.PodManagementPolicy = PodManagementPolicyType(in.PodManagementPolicy)
|
|
if err := Convert_apps_StatefulSetUpdateStrategy_To_v1beta1_StatefulSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_v1beta1_StatefulSetUpdateStrategy_To_apps_StatefulSetUpdateStrategy(in *StatefulSetUpdateStrategy, out *apps.StatefulSetUpdateStrategy, s conversion.Scope) error {
|
|
out.Type = apps.StatefulSetUpdateStrategyType(in.Type)
|
|
if in.Partition != nil {
|
|
out.Partition = new(apps.PartitionStatefulSetStrategy)
|
|
out.Partition.Ordinal = in.Partition.Ordinal
|
|
} else {
|
|
out.Partition = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_apps_StatefulSetUpdateStrategy_To_v1beta1_StatefulSetUpdateStrategy(in *apps.StatefulSetUpdateStrategy, out *StatefulSetUpdateStrategy, s conversion.Scope) error {
|
|
out.Type = StatefulSetUpdateStrategyType(in.Type)
|
|
if in.Partition != nil {
|
|
out.Partition = new(PartitionStatefulSetStrategy)
|
|
out.Partition.Ordinal = in.Partition.Ordinal
|
|
} else {
|
|
out.Partition = nil
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error {
|
|
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 := metav1.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 {
|
|
out.Replicas = 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 := metav1.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(metav1.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_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
|
|
if in.Replicas != nil {
|
|
out.Replicas = *in.Replicas
|
|
}
|
|
out.Selector = in.Selector
|
|
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
|
|
}
|
|
out.RevisionHistoryLimit = in.RevisionHistoryLimit
|
|
out.MinReadySeconds = 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
|
|
}
|
|
if in.ProgressDeadlineSeconds != nil {
|
|
out.ProgressDeadlineSeconds = new(int32)
|
|
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error {
|
|
out.Replicas = &in.Replicas
|
|
out.Selector = in.Selector
|
|
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
|
|
}
|
|
if in.ProgressDeadlineSeconds != nil {
|
|
out.ProgressDeadlineSeconds = new(int32)
|
|
*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *extensions.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
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 {
|
|
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_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *extensions.RollingUpdateDeployment, s conversion.Scope) error {
|
|
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_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *extensions.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
|
|
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
|
|
}
|