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

move deployment PodTemplate to be not a pointer

Browse Source
This commit is contained in:
Mike Danese
2015-10-26 16:20:43 -07:00
parent d5e680afbb
commit b0a41108af
13 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,10 +45,8 @@ func addDefaultingFuncs() {
},
func(obj *Deployment) {
// Default labels and selector to labels from pod template spec.
var labels map[string]string
if obj.Spec.Template != nil {
labels = obj.Spec.Template.Labels
}
labels := obj.Spec.Template.Labels
if labels != nil {
if len(obj.Spec.Selector) == 0 {
obj.Spec.Selector = labels