Skip to content

Commit e174f5c

Browse files
deepsm007deepsm007
committed
Removing featuregate for chunkSizeMiB config
1 parent 909020d commit e174f5c

File tree

5 files changed

+27
-32
lines changed

5 files changed

+27
-32
lines changed

‎pkg/resource/podtemplatespec_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,11 @@ func TestMakePodTemplateSpecS3CloudFront(t *testing.T) {
509509
testBuilder.AddNamespaces(imageRegNs)
510510

511511
fixture := testBuilder.Build()
512-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
513-
[]configv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
512+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
513+
[]configv1.FeatureGateName{util.TestFeatureGateName},
514514
[]configv1.FeatureGateName{},
515515
)
516-
s3Storage := s3.NewDriver(ctx, config.Spec.Storage.S3, &fixture.Listers.StorageListers, ChunkSizeMiBFeatureGateAccessor)
516+
s3Storage := s3.NewDriver(ctx, config.Spec.Storage.S3, &fixture.Listers.StorageListers, TestFeatureGateAccessor)
517517
pod, _, err := makePodTemplateSpec(fixture.KubeClient.CoreV1(), fixture.Listers.ProxyConfigs, s3Storage, config)
518518
if err != nil {
519519
t.Fatalf("error creating pod template: %v", err)

‎pkg/storage/s3/s3.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,7 @@ 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-
currentFeatureGates, err := d.featureGateAccessor.CurrentFeatureGates()
418-
if err != nil {
419-
return
420-
}
421-
422-
if currentFeatureGates.Enabled(util.ChunkSizeMiBFeatureGateName) && d.Config.ChunkSizeMiB > 4 && d.Config.ChunkSizeMiB < 5121 {
417+
if d.Config.ChunkSizeMiB > 4 && d.Config.ChunkSizeMiB < 5121 {
423418
chunksize := int64(d.Config.ChunkSizeMiB) * 1024 * 1024
424419
envs = append(envs, envvar.EnvVar{Name: "REGISTRY_STORAGE_S3_CHUNKSIZE", Value: chunksize})
425420
}

‎pkg/storage/s3/s3_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,12 @@ func TestConfigEnv(t *testing.T) {
258258
})
259259
listers := testBuilder.BuildListers()
260260

261-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
262-
[]configv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
261+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
262+
[]configv1.FeatureGateName{util.TestFeatureGateName},
263263
[]configv1.FeatureGateName{},
264264
)
265265

266-
d := NewDriver(ctx, config, &listers.StorageListers, ChunkSizeMiBFeatureGateAccessor)
266+
d := NewDriver(ctx, config, &listers.StorageListers, TestFeatureGateAccessor)
267267

268268
envvars, err := d.ConfigEnv()
269269
if err != nil {
@@ -327,12 +327,12 @@ func TestServiceEndpointCanBeOverwritten(t *testing.T) {
327327
})
328328
listers := testBuilder.BuildListers()
329329

330-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
331-
[]configv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
330+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
331+
[]configv1.FeatureGateName{util.TestFeatureGateName},
332332
[]configv1.FeatureGateName{},
333333
)
334334

335-
d := NewDriver(ctx, config, &listers.StorageListers, ChunkSizeMiBFeatureGateAccessor)
335+
d := NewDriver(ctx, config, &listers.StorageListers, TestFeatureGateAccessor)
336336

337337
envvars, err := d.ConfigEnv()
338338
if err != nil {
@@ -516,11 +516,11 @@ func TestStorageManagementState(t *testing.T) {
516516
rt.AddResponse(code)
517517
}
518518
}
519-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
520-
[]configv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
519+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
520+
[]configv1.FeatureGateName{util.TestFeatureGateName},
521521
[]configv1.FeatureGateName{},
522522
)
523-
drv := NewDriver(context.Background(), tt.config.Spec.Storage.S3, &listers.StorageListers, ChunkSizeMiBFeatureGateAccessor)
523+
drv := NewDriver(context.Background(), tt.config.Spec.Storage.S3, &listers.StorageListers, TestFeatureGateAccessor)
524524

525525
drv.roundTripper = rt
526526

@@ -750,11 +750,11 @@ func TestUserProvidedTags(t *testing.T) {
750750
},
751751
})
752752
listers := builder.BuildListers()
753-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
754-
[]configv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
753+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
754+
[]configv1.FeatureGateName{util.TestFeatureGateName},
755755
[]configv1.FeatureGateName{},
756756
)
757-
drv := NewDriver(context.Background(), tt.config.Spec.Storage.S3, &listers.StorageListers, ChunkSizeMiBFeatureGateAccessor)
757+
drv := NewDriver(context.Background(), tt.config.Spec.Storage.S3, &listers.StorageListers, TestFeatureGateAccessor)
758758
rt := &tripper{}
759759
if len(tt.responseCodes) > 0 {
760760
for _, code := range tt.responseCodes {

‎pkg/storage/util/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
1919
)
2020

21-
// ChunkSizeMiBFeatureGateName is a constant use in helper function for testing
22-
const ChunkSizeMiBFeatureGateName = "ChunkSizeMiB"
21+
// TestFeatureGateName is a constant use in helper function for testing
22+
const TestFeatureGateName = "TestFeatureGate"
2323

2424
// multiDashes is a regexp matching multiple dashes in a sequence.
2525
var multiDashes = regexp.MustCompile(`-{2,}`)

‎test/e2e/aws_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ func TestAWSDefaults(t *testing.T) {
8181
framework.EnsureServiceCAConfigMap(te)
8282
framework.EnsureNodeCADaemonSetIsAvailable(te)
8383

84-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
85-
[]configapiv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
84+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
85+
[]configapiv1.FeatureGateName{util.TestFeatureGateName},
8686
[]configapiv1.FeatureGateName{},
8787
)
88-
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, ChunkSizeMiBFeatureGateAccessor)
88+
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, TestFeatureGateAccessor)
8989
err = s3Driver.UpdateEffectiveConfig()
9090
if err != nil {
9191
t.Errorf("unable to get cluster configuration: %#v", err)
@@ -422,12 +422,12 @@ func TestAWSUpdateCredentials(t *testing.T) {
422422
t.Fatal(err)
423423
}
424424

425-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
426-
[]configapiv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
425+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
426+
[]configapiv1.FeatureGateName{util.TestFeatureGateName},
427427
[]configapiv1.FeatureGateName{},
428428
)
429429
// Check that the user provided credentials override the system provided ones
430-
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, ChunkSizeMiBFeatureGateAccessor)
430+
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, TestFeatureGateAccessor)
431431

432432
sharedCredentialsFile, err := s3Driver.GetCredentialsFile()
433433
if err != nil {
@@ -518,11 +518,11 @@ func TestAWSChangeS3Encryption(t *testing.T) {
518518
}
519519
defer awsCleanup()
520520

521-
ChunkSizeMiBFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
522-
[]configapiv1.FeatureGateName{util.ChunkSizeMiBFeatureGateName},
521+
TestFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
522+
[]configapiv1.FeatureGateName{util.TestFeatureGateName},
523523
[]configapiv1.FeatureGateName{},
524524
)
525-
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, ChunkSizeMiBFeatureGateAccessor)
525+
s3Driver := storages3.NewDriver(context.Background(), nil, &mockLister.StorageListers, TestFeatureGateAccessor)
526526
err = s3Driver.UpdateEffectiveConfig()
527527
if err != nil {
528528
t.Errorf("unable to get cluster configuration: %#v", err)

0 commit comments

Comments
 (0)