github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move old defaulters to public functions

Browse Source 
Also make Deployment defaulting resilient to fuzzing
This commit is contained in:
Clayton Coleman
2016-09-24 23:26:32 -04:00
parent 68a9983ec7
commit 0aa8da19a9
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ func SetDefaults_Deployment(obj *Deployment) {
if strategy.Type == "" { if strategy.Type == "" {
strategy.Type = RollingUpdateDeploymentStrategyType strategy.Type = RollingUpdateDeploymentStrategyType
} }
if strategy.Type == RollingUpdateDeploymentStrategyType { if strategy.Type == RollingUpdateDeploymentStrategyType || strategy.RollingUpdate != nil {
if strategy.RollingUpdate == nil { if strategy.RollingUpdate == nil {
rollingUpdate := RollingUpdateDeployment{} rollingUpdate := RollingUpdateDeployment{}
strategy.RollingUpdate = &rollingUpdate strategy.RollingUpdate = &rollingUpdate

23
pkg/apis/rbac/v1alpha1/defaults.go
View File

@@ -22,15 +22,18 @@ import (
func addDefaultingFuncs(scheme *runtime.Scheme) error { func addDefaultingFuncs(scheme *runtime.Scheme) error {
return scheme.AddDefaultingFuncs( return scheme.AddDefaultingFuncs(
func(obj *ClusterRoleBinding) { SetDefaults_ClusterRoleBinding,
if len(obj.RoleRef.APIGroup) == 0 { SetDefaults_RoleBinding,
obj.RoleRef.APIGroup = GroupName
}
},
func(obj *RoleBinding) {
if len(obj.RoleRef.APIGroup) == 0 {
obj.RoleRef.APIGroup = GroupName
}
},
) )
} }
func SetDefaults_ClusterRoleBinding(obj *ClusterRoleBinding) {
if len(obj.RoleRef.APIGroup) == 0 {
obj.RoleRef.APIGroup = GroupName
}
}
func SetDefaults_RoleBinding(obj *RoleBinding) {
if len(obj.RoleRef.APIGroup) == 0 {
obj.RoleRef.APIGroup = GroupName
}
}