diff --git a/pkg/resource/podtemplatespec_test.go b/pkg/resource/podtemplatespec_test.go index 71683b54f..b5812877b 100644 --- a/pkg/resource/podtemplatespec_test.go +++ b/pkg/resource/podtemplatespec_test.go @@ -465,10 +465,9 @@ func TestMakePodTemplateSpecS3CloudFront(t *testing.T) { Storage: v1.ImageRegistryConfigStorage{ ManagementState: "Unmanaged", S3: &v1.ImageRegistryConfigStorageS3{ - Bucket: "bucket", - Region: "region", - ChunkSizeMiB: 10, - Encrypt: true, + Bucket: "bucket", + Region: "region", + Encrypt: true, CloudFront: &v1.ImageRegistryConfigStorageS3CloudFront{ BaseURL: "https://cloudfront.example.com", KeypairID: "keypair-id", @@ -526,7 +525,6 @@ func TestMakePodTemplateSpecS3CloudFront(t *testing.T) { expectedEnvVars := map[string]corev1.EnvVar{ "REGISTRY_STORAGE": {Value: "s3"}, "REGISTRY_STORAGE_S3_BUCKET": {Value: "bucket"}, - "REGISTRY_STORAGE_S3_CHUNKSIZE": {Value: "10485760"}, "REGISTRY_STORAGE_S3_REGION": {Value: "region"}, "REGISTRY_STORAGE_S3_ENCRYPT": {Value: "true"}, "REGISTRY_STORAGE_S3_FORCEPATHSTYLE": {Value: "false"}, diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go index 2d7815ae9..94400437f 100644 --- a/pkg/storage/s3/s3.go +++ b/pkg/storage/s3/s3.go @@ -414,11 +414,6 @@ func (d *driver) ConfigEnv() (envs envvar.List, err error) { envs = append(envs, envvar.EnvVar{Name: "REGISTRY_STORAGE_S3_KEYID", Value: d.Config.KeyID}) } - if d.Config.ChunkSizeMiB > 4 && d.Config.ChunkSizeMiB < 5121 { - chunksize := int64(d.Config.ChunkSizeMiB) * 1024 * 1024 - envs = append(envs, envvar.EnvVar{Name: "REGISTRY_STORAGE_S3_CHUNKSIZE", Value: chunksize}) - } - // virtualHostedStyle tells the registry to use urls in the form of // bucket-name.s3-endpoint.etc. // the forcePathStyle setting was introduced to control the same