Skip to content

Commit 641b9d7

Browse files
committed
Remove ChunkSizeMib featuregate
1 parent b06a3d8 commit 641b9d7

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

pkg/resource/podtemplatespec_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,9 @@ func TestMakePodTemplateSpecS3CloudFront(t *testing.T) {
465465
Storage: v1.ImageRegistryConfigStorage{
466466
ManagementState: "Unmanaged",
467467
S3: &v1.ImageRegistryConfigStorageS3{
468-
Bucket: "bucket",
469-
Region: "region",
470-
ChunkSizeMiB: 10,
471-
Encrypt: true,
468+
Bucket: "bucket",
469+
Region: "region",
470+
Encrypt: true,
472471
CloudFront: &v1.ImageRegistryConfigStorageS3CloudFront{
473472
BaseURL: "https://cloudfront.example.com",
474473
KeypairID: "keypair-id",
@@ -526,7 +525,6 @@ func TestMakePodTemplateSpecS3CloudFront(t *testing.T) {
526525
expectedEnvVars := map[string]corev1.EnvVar{
527526
"REGISTRY_STORAGE": {Value: "s3"},
528527
"REGISTRY_STORAGE_S3_BUCKET": {Value: "bucket"},
529-
"REGISTRY_STORAGE_S3_CHUNKSIZE": {Value: "10485760"},
530528
"REGISTRY_STORAGE_S3_REGION": {Value: "region"},
531529
"REGISTRY_STORAGE_S3_ENCRYPT": {Value: "true"},
532530
"REGISTRY_STORAGE_S3_FORCEPATHSTYLE": {Value: "false"},

pkg/storage/s3/s3.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,6 @@ func (d *driver) ConfigEnv() (envs envvar.List, err error) {
414414
envs = append(envs, envvar.EnvVar{Name: "REGISTRY_STORAGE_S3_KEYID", Value: d.Config.KeyID})
415415
}
416416

417-
if d.Config.ChunkSizeMiB > 4 && d.Config.ChunkSizeMiB < 5121 {
418-
chunksize := int64(d.Config.ChunkSizeMiB) * 1024 * 1024
419-
envs = append(envs, envvar.EnvVar{Name: "REGISTRY_STORAGE_S3_CHUNKSIZE", Value: chunksize})
420-
}
421-
422417
// virtualHostedStyle tells the registry to use urls in the form of
423418
// bucket-name.s3-endpoint.etc.
424419
// the forcePathStyle setting was introduced to control the same

0 commit comments

Comments
 (0)