Merge pull request #19743 from bparees/bulk

openshift-merge-robot · web-flow · commit 95aa365ffa2d · 2018-07-06T12:35:53.000-07:00
change default bulk image import from 5 to 50
diff --git a/pkg/cmd/server/apis/config/serialization_test.go b/pkg/cmd/server/apis/config/serialization_test.go
@@ -286,7 +286,7 @@ func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runti
 		func(obj *configapi.ImagePolicyConfig, c fuzz.Continue) {
 			c.FuzzNoCustom(obj)
 			if obj.MaxImagesBulkImportedPerRepository == 0 {
-				obj.MaxImagesBulkImportedPerRepository = 5
+				obj.MaxImagesBulkImportedPerRepository = 50
 			}
 			if obj.MaxScheduledImageImportsPerMinute == 0 {
 				obj.MaxScheduledImageImportsPerMinute = 60
diff --git a/pkg/cmd/server/apis/config/v1/conversions.go b/pkg/cmd/server/apis/config/v1/conversions.go
@@ -214,7 +214,7 @@ func SetDefaults_ServingInfo(obj *ServingInfo) {
 }
 func SetDefaults_ImagePolicyConfig(obj *ImagePolicyConfig) {
 	if obj.MaxImagesBulkImportedPerRepository == 0 {
-		obj.MaxImagesBulkImportedPerRepository = 5
+		obj.MaxImagesBulkImportedPerRepository = 50
 	}
 	if obj.MaxScheduledImageImportsPerMinute == 0 {
 		obj.MaxScheduledImageImportsPerMinute = 60
diff --git a/pkg/cmd/server/apis/config/v1/swagger_doc.go b/pkg/cmd/server/apis/config/v1/swagger_doc.go
diff --git a/pkg/cmd/server/apis/config/v1/testdata/master-config.yaml b/pkg/cmd/server/apis/config/v1/testdata/master-config.yaml
@@ -75,7 +75,7 @@ imageConfig:
   latest: false
 imagePolicyConfig:
   disableScheduledImport: false
-  maxImagesBulkImportedPerRepository: 5
+  maxImagesBulkImportedPerRepository: 50
   maxScheduledImageImportsPerMinute: 60
   scheduledImageImportMinimumIntervalSeconds: 900
 jenkinsPipelineConfig:
diff --git a/pkg/cmd/server/apis/config/v1/types.go b/pkg/cmd/server/apis/config/v1/types.go
@@ -383,7 +383,7 @@ type JenkinsPipelineConfig struct {
 // ImagePolicyConfig holds the necessary configuration options for limits and behavior for importing images
 type ImagePolicyConfig struct {
 	// MaxImagesBulkImportedPerRepository controls the number of images that are imported when a user
-	// does a bulk import of a Docker repository. This number defaults to 5 to prevent users from
+	// does a bulk import of a Docker repository. This number defaults to 50 to prevent users from
 	// importing large numbers of images accidentally. Set -1 for no limit.
 	MaxImagesBulkImportedPerRepository int `json:"maxImagesBulkImportedPerRepository"`
 	// DisableScheduledImport allows scheduled background import of images to be disabled.

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runti`
`286`	`286`	`func(obj *configapi.ImagePolicyConfig, c fuzz.Continue) {`
`287`	`287`	`c.FuzzNoCustom(obj)`
`288`	`288`	`if obj.MaxImagesBulkImportedPerRepository == 0 {`
`289`		`- obj.MaxImagesBulkImportedPerRepository = 5`
	`289`	`+ obj.MaxImagesBulkImportedPerRepository = 50`
`290`	`290`	`}`
`291`	`291`	`if obj.MaxScheduledImageImportsPerMinute == 0 {`
`292`	`292`	`obj.MaxScheduledImageImportsPerMinute = 60`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func SetDefaults_ServingInfo(obj *ServingInfo) {`
`214`	`214`	`}`
`215`	`215`	`func SetDefaults_ImagePolicyConfig(obj *ImagePolicyConfig) {`
`216`	`216`	`if obj.MaxImagesBulkImportedPerRepository == 0 {`
`217`		`- obj.MaxImagesBulkImportedPerRepository = 5`
	`217`	`+ obj.MaxImagesBulkImportedPerRepository = 50`
`218`	`218`	`}`
`219`	`219`	`if obj.MaxScheduledImageImportsPerMinute == 0 {`
`220`	`220`	`obj.MaxScheduledImageImportsPerMinute = 60`