From 0aa8da19a973f93ac39e6adb69511e16e7765b6d Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 24 Sep 2016 23:26:32 -0400 Subject: [PATCH] Move old defaulters to public functions Also make Deployment defaulting resilient to fuzzing --- pkg/apis/extensions/v1beta1/defaults.go | 2 +- pkg/apis/rbac/v1alpha1/defaults.go | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 0708b11e1a3..1591808ca13 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -71,7 +71,7 @@ func SetDefaults_Deployment(obj *Deployment) { if strategy.Type == "" { strategy.Type = RollingUpdateDeploymentStrategyType } - if strategy.Type == RollingUpdateDeploymentStrategyType { + if strategy.Type == RollingUpdateDeploymentStrategyType || strategy.RollingUpdate != nil { if strategy.RollingUpdate == nil { rollingUpdate := RollingUpdateDeployment{} strategy.RollingUpdate = &rollingUpdate diff --git a/pkg/apis/rbac/v1alpha1/defaults.go b/pkg/apis/rbac/v1alpha1/defaults.go index e97f4109c64..2e0b17277c1 100644 --- a/pkg/apis/rbac/v1alpha1/defaults.go +++ b/pkg/apis/rbac/v1alpha1/defaults.go @@ -22,15 +22,18 @@ import ( func addDefaultingFuncs(scheme *runtime.Scheme) error { return scheme.AddDefaultingFuncs( - func(obj *ClusterRoleBinding) { - if len(obj.RoleRef.APIGroup) == 0 { - obj.RoleRef.APIGroup = GroupName - } - }, - func(obj *RoleBinding) { - if len(obj.RoleRef.APIGroup) == 0 { - obj.RoleRef.APIGroup = GroupName - } - }, + SetDefaults_ClusterRoleBinding, + SetDefaults_RoleBinding, ) } + +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 + } +}