Skip to content

Commit e772c0a

Browse files
committed
Remove featuregate ChunkSizeMib
1 parent 9f36190 commit e772c0a

File tree

15 files changed

+25
-2428
lines changed

15 files changed

+25
-2428
lines changed

features.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
| AzureWorkloadIdentity| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8080
| BuildCSIVolumes| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8181
| CPMSMachineNamePrefix| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
82-
| ChunkSizeMiB| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8382
| ConsolePluginContentSecurityPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8483
| GatewayAPI| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
8584
| GatewayAPIController| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |

features/features.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,6 @@ var (
578578
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
579579
mustRegister()
580580

581-
FeatureGateChunkSizeMiB = newFeatureGate("ChunkSizeMiB").
582-
reportProblemsToJiraComponent("Image Registry").
583-
contactPerson("flavianmissi").
584-
productScope(ocpSpecific).
585-
enhancementPR(legacyFeatureGateWithoutEnhancement).
586-
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
587-
mustRegister()
588-
589581
FeatureGateMachineAPIMigration = newFeatureGate("MachineAPIMigration").
590582
reportProblemsToJiraComponent("OCPCLOUD").
591583
contactPerson("jspeed").

features/legacyfeaturegates.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ var legacyFeatureGates = sets.New(
2121
// never add to this list, if you think you have an exception ask @deads2k
2222
"BuildCSIVolumes",
2323
// never add to this list, if you think you have an exception ask @deads2k
24-
"ChunkSizeMiB",
25-
// never add to this list, if you think you have an exception ask @deads2k
2624
"ClusterAPIInstall",
2725
// never add to this list, if you think you have an exception ask @deads2k
2826
"ClusterAPIInstallIBMCloud",

imageregistry/v1/tests/configs.imageregistry.operator.openshift.io/ChunkSizeMiB.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
22
name: "Config"
33
crdName: configs.imageregistry.operator.openshift.io
4-
featureGates:
5-
- ChunkSizeMiB
64
tests:
75
onCreate:
86
- name: Should be able to create a minimal Config

imageregistry/v1/types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ type ImageRegistryConfigStorageS3 struct {
215215
// The minimum value is 5 and the maximum value is 5120 (5 GiB).
216216
// +kubebuilder:validation:Minimum=5
217217
// +kubebuilder:validation:Maximum=5120
218-
// +openshift:enable:FeatureGate=ChunkSizeMiB
219218
// +optional
220219
ChunkSizeMiB int32 `json:"chunkSizeMiB,omitempty"`
221220
// encrypt specifies whether the registry stores the image in encrypted

imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ configs.imageregistry.operator.openshift.io:
44
CRDName: configs.imageregistry.operator.openshift.io
55
Capability: ""
66
Category: ""
7-
FeatureGates:
8-
- ChunkSizeMiB
7+
FeatureGates: []
98
FilenameOperatorName: ""
109
FilenameOperatorOrdering: "00"
1110
FilenameRunLevel: ""

imageregistry/v1/zz_generated.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,6 +1468,18 @@ spec:
14681468
data.
14691469
Optional, will be generated if not provided.
14701470
type: string
1471+
chunkSizeMiB:
1472+
description: |-
1473+
chunkSizeMiB defines the size of the multipart upload chunks of the S3 API.
1474+
The S3 API requires multipart upload chunks to be at least 5MiB.
1475+
When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
1476+
The current default value is 10 MiB.
1477+
The value is an integer number of MiB.
1478+
The minimum value is 5 and the maximum value is 5120 (5 GiB).
1479+
format: int32
1480+
maximum: 5120
1481+
minimum: 5
1482+
type: integer
14711483
cloudFront:
14721484
description: |-
14731485
cloudFront configures Amazon Cloudfront as the storage middleware in a
@@ -2212,6 +2224,18 @@ spec:
22122224
data.
22132225
Optional, will be generated if not provided.
22142226
type: string
2227+
chunkSizeMiB:
2228+
description: |-
2229+
chunkSizeMiB defines the size of the multipart upload chunks of the S3 API.
2230+
The S3 API requires multipart upload chunks to be at least 5MiB.
2231+
When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
2232+
The current default value is 10 MiB.
2233+
The value is an integer number of MiB.
2234+
The minimum value is 5 and the maximum value is 5120 (5 GiB).
2235+
format: int32
2236+
maximum: 5120
2237+
minimum: 5
2238+
type: integer
22152239
cloudFront:
22162240
description: |-
22172241
cloudFront configures Amazon Cloudfront as the storage middleware in a

0 commit comments

Comments
 (0)