Skip to content

Commit dc4b0c4

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1073 from deepsm007/expose-chunksize
IR-471: Removing featuregate for chunkSizeMiB config
2 parents 08badfe + e174f5c commit dc4b0c4

File tree

658 files changed

+54506
-23501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

658 files changed

+54506
-23501
lines changed

‎go.mod

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/cluster-image-registry-operator
22

3-
go 1.22
3+
go 1.22.0
44

55
require (
66
cloud.google.com/go/resourcemanager v1.9.6
@@ -32,25 +32,25 @@ require (
3232
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99
3333
github.com/goware/urlx v0.3.2
3434
github.com/jongio/azidext/go/azidext v0.5.0
35-
github.com/openshift/api v0.0.0-20240508125607-95e22923d553
36-
github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
37-
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd
38-
github.com/openshift/library-go v0.0.0-20240508091607-5fface69be35
35+
github.com/openshift/api v0.0.0-20240805090819-b8f07e1d8f62
36+
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
37+
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
38+
github.com/openshift/library-go v0.0.0-20240709182732-b94141242b0c
3939
github.com/ppc64le-cloud/powervs-utils v0.0.0-20240105123432-7588e9595c17
4040
github.com/prometheus/client_golang v1.16.0
4141
github.com/prometheus/client_model v0.4.0
4242
github.com/prometheus/common v0.44.0
4343
github.com/spf13/cobra v1.7.0
4444
github.com/stretchr/testify v1.8.4
45-
golang.org/x/net v0.22.0
45+
golang.org/x/net v0.23.0
4646
golang.org/x/oauth2 v0.18.0
4747
golang.org/x/time v0.5.0
4848
google.golang.org/api v0.172.0
4949
gopkg.in/yaml.v2 v2.4.0
50-
k8s.io/api v0.29.0
51-
k8s.io/apimachinery v0.29.0
52-
k8s.io/client-go v0.29.0
53-
k8s.io/klog/v2 v2.110.1
50+
k8s.io/api v0.30.1
51+
k8s.io/apimachinery v0.30.1
52+
k8s.io/client-go v0.30.1
53+
k8s.io/klog/v2 v2.120.1
5454
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
5555
)
5656

@@ -98,7 +98,7 @@ require (
9898
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
9999
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
100100
github.com/golang/protobuf v1.5.4 // indirect
101-
github.com/google/cel-go v0.17.7 // indirect
101+
github.com/google/cel-go v0.17.8 // indirect
102102
github.com/google/gnostic-models v0.6.8 // indirect
103103
github.com/google/gofuzz v1.2.0 // indirect
104104
github.com/google/s2a-go v0.1.7 // indirect
@@ -147,9 +147,8 @@ require (
147147
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
148148
go.opentelemetry.io/otel/trace v1.24.0 // indirect
149149
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
150-
go.uber.org/atomic v1.10.0 // indirect
151150
go.uber.org/multierr v1.11.0 // indirect
152-
go.uber.org/zap v1.19.0 // indirect
151+
go.uber.org/zap v1.26.0 // indirect
153152
golang.org/x/crypto v0.21.0 // indirect
154153
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
155154
golang.org/x/sync v0.6.0 // indirect
@@ -166,13 +165,13 @@ require (
166165
gopkg.in/ini.v1 v1.66.2 // indirect
167166
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
168167
gopkg.in/yaml.v3 v3.0.1 // indirect
169-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
170-
k8s.io/apiserver v0.29.0 // indirect
171-
k8s.io/component-base v0.29.0 // indirect
172-
k8s.io/kms v0.29.0 // indirect
173-
k8s.io/kube-aggregator v0.29.0 // indirect
174-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
175-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
168+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
169+
k8s.io/apiserver v0.30.1 // indirect
170+
k8s.io/component-base v0.30.1 // indirect
171+
k8s.io/kms v0.30.1 // indirect
172+
k8s.io/kube-aggregator v0.30.1 // indirect
173+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
174+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
176175
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
177176
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
178177
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

‎go.sum

Lines changed: 46 additions & 56 deletions
Large diffs are not rendered by default.

‎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/ibmcos/ibmcos.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ func (d *driver) setServiceEndpointOverrides(infra *configapiv1.Infrastructure)
488488
case configapiv1.IBMCloudServiceResourceManager:
489489
klog.Infof("found override for ibmcloud resource manager endpoint: %s", endpoint.URL)
490490
d.rmServiceEndpoint = endpoint.URL
491-
case configapiv1.IBMCloudServiceCIS, configapiv1.IBMCloudServiceDNSServices, configapiv1.IBMCloudServiceGlobalSearch, configapiv1.IBMCloudServiceGlobalTagging, configapiv1.IBMCloudServiceHyperProtect, configapiv1.IBMCloudServiceKeyProtect, configapiv1.IBMCloudServiceVPC:
491+
case configapiv1.IBMCloudServiceCIS, configapiv1.IBMCloudServiceDNSServices, configapiv1.IBMCloudServiceGlobalSearch, configapiv1.IBMCloudServiceGlobalTagging, configapiv1.IBMCloudServiceHyperProtect, configapiv1.IBMCloudServiceKeyProtect, configapiv1.IBMCloudServiceVPC, configapiv1.IBMCloudServiceCOSConfig, configapiv1.IBMCloudServiceGlobalCatalog:
492492
klog.Infof("ignoring unused service endpoint: %s", endpoint.Name)
493493
default:
494494
klog.Infof("ignoring unknown service: %s", endpoint.Name)
@@ -511,7 +511,7 @@ func (d *driver) setServiceEndpointOverrides(infra *configapiv1.Infrastructure)
511511
case strings.ToLower(string(configapiv1.IBMCloudServiceResourceManager)):
512512
klog.Infof("found override for ibmcloud resource manager endpoint: %s", endpoint.URL)
513513
d.rmServiceEndpoint = endpoint.URL
514-
case strings.ToLower(string(configapiv1.IBMCloudServiceCIS)), strings.ToLower(string(configapiv1.IBMCloudServiceDNSServices)), strings.ToLower(string(configapiv1.IBMCloudServiceGlobalSearch)), strings.ToLower(string(configapiv1.IBMCloudServiceGlobalTagging)), strings.ToLower(string(configapiv1.IBMCloudServiceHyperProtect)), strings.ToLower(string(configapiv1.IBMCloudServiceKeyProtect)), strings.ToLower(string(configapiv1.IBMCloudServiceVPC)):
514+
case strings.ToLower(string(configapiv1.IBMCloudServiceCIS)), strings.ToLower(string(configapiv1.IBMCloudServiceDNSServices)), strings.ToLower(string(configapiv1.IBMCloudServiceGlobalSearch)), strings.ToLower(string(configapiv1.IBMCloudServiceGlobalTagging)), strings.ToLower(string(configapiv1.IBMCloudServiceHyperProtect)), strings.ToLower(string(configapiv1.IBMCloudServiceKeyProtect)), strings.ToLower(string(configapiv1.IBMCloudServiceVPC)), strings.ToLower(string(configapiv1.IBMCloudServiceCOSConfig)), strings.ToLower(string(configapiv1.IBMCloudServiceGlobalCatalog)):
515515
klog.Infof("ignoring unused service endpoint: %s", endpoint.Name)
516516
default:
517517
klog.Infof("ignoring unknown service: %s", endpoint.Name)

‎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)

‎vendor/github.com/go-logr/logr/slogr/slogr.go

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎vendor/github.com/google/cel-go/checker/cost.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)