github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Revert "remove versioned LabelSelector definitions"

Browse Source 
This reverts commit 1ace8fa9ce.
This commit is contained in:
gmarek
2016-10-26 16:52:02 +02:00
parent be340665e0
commit 24975aad30
43 changed files with 14370 additions and 9886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/apis/extensions/v1beta1/defaults.go
View File

@@ -17,7 +17,6 @@ limitations under the License.
package v1beta1
import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/intstr"
@@ -41,7 +40,7 @@ func SetDefaults_DaemonSet(obj *DaemonSet) {
// TODO: support templates defined elsewhere when we support them in the API
if labels != nil {
if obj.Spec.Selector == nil {
obj.Spec.Selector = &unversioned.LabelSelector{
obj.Spec.Selector = &LabelSelector{
MatchLabels: labels,
}
}
@@ -57,7 +56,7 @@ func SetDefaults_Deployment(obj *Deployment) {
if labels != nil {
if obj.Spec.Selector == nil {
obj.Spec.Selector = &unversioned.LabelSelector{MatchLabels: labels}
obj.Spec.Selector = &LabelSelector{MatchLabels: labels}
}
if len(obj.Labels) == 0 {
obj.Labels = labels
@@ -103,7 +102,7 @@ func SetDefaults_Job(obj *Job) {
// and default behavior for an unspecified manual selector is to use the pod template labels
if manualSelector && obj.Spec.Selector == nil {
obj.Spec.Selector = &unversioned.LabelSelector{
obj.Spec.Selector = &LabelSelector{
MatchLabels: labels,
}
}
@@ -141,7 +140,7 @@ func SetDefaults_ReplicaSet(obj *ReplicaSet) {
// TODO: support templates defined elsewhere when we support them in the API
if labels != nil {
if obj.Spec.Selector == nil {
obj.Spec.Selector = &unversioned.LabelSelector{
obj.Spec.Selector = &LabelSelector{
MatchLabels: labels,
}
}