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

ReplicaSetSpec.Template shouldn't be a pointer.

Browse Source 
PodTemplateSpec should be consistent for all the types in extensions/v1beta1.

See PR #19510.
This commit is contained in:
Madhusudan.C.S
2016-03-09 13:11:13 -08:00
parent 108f722657
commit db48dcf583
22 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,10 +118,8 @@ func addDefaultingFuncs(scheme *runtime.Scheme) {
}
},
func(obj *ReplicaSet) {
var labels map[string]string
if obj.Spec.Template != nil {
labels = obj.Spec.Template.Labels
}
labels := obj.Spec.Template.Labels
// TODO: support templates defined elsewhere when we support them in the API
if labels != nil {
if obj.Spec.Selector == nil {