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

Merge pull request #42914 from liggitt/fix-defaulting

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44424, 44026, 43939, 44386, 42914)

remove defaulting from conversion path

follow up for #42764

* remove call to defaulting from conversion path (defaulting is a separate step from conversion)
* remove non-top-level-object defaulting registration (unused after conversion call is removed)
* generate missing top-level defaults for some api groups:
  * autoscaling/v2alpha1
  * policy/v1alpha1
  * policy/v1beta1
* register top-level defaults for some api groups that were missing them:
  * autoscaling/v2alpha1
  * settings/v1alpha1
This commit is contained in:
Kubernetes Submit Queue
2017-04-13 22:07:10 -07:00
committed by GitHub
parent f83badf057 ad116026d9
commit 5ad494077e
72 changed files with 273 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/batch/v1/defaults.go
View File

@@ -21,10 +21,7 @@ import (
)
func addDefaultingFuncs(scheme *runtime.Scheme) error {
RegisterDefaults(scheme)
return scheme.AddDefaultingFuncs(
SetDefaults_Job,
)
return RegisterDefaults(scheme)
}
func SetDefaults_Job(obj *Job) {

5
pkg/apis/batch/v2alpha1/defaults.go
View File

@@ -21,10 +21,7 @@ import (
)
func addDefaultingFuncs(scheme *runtime.Scheme) error {
RegisterDefaults(scheme)
return scheme.AddDefaultingFuncs(
SetDefaults_CronJob,
)
return RegisterDefaults(scheme)
}
func SetDefaults_CronJob(obj *CronJob) {