Merge pull request #2438 from deepsm007/remove-chunksize-var

OCPBUGS-55665: Remove featuregate ChunkSizeMib

Author: openshift-merge-bot[bot]

features.md

@@ -78,7 +78,6 @@
 | 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>  |
 | 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>  |
 | 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>  |
-| 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>  |
 | 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>  |
 | 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>  |
 | 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

@@ -571,14 +571,6 @@ var (
 						enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
 						mustRegister()
 
-	FeatureGateChunkSizeMiB = newFeatureGate("ChunkSizeMiB").
-				reportProblemsToJiraComponent("Image Registry").
-				contactPerson("flavianmissi").
-				productScope(ocpSpecific).
-				enhancementPR(legacyFeatureGateWithoutEnhancement).
-				enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
-				mustRegister()
-
 	FeatureGateMachineAPIMigration = newFeatureGate("MachineAPIMigration").
 					reportProblemsToJiraComponent("OCPCLOUD").
 					contactPerson("jspeed").

features/legacyfeaturegates.go

@@ -21,8 +21,6 @@ var legacyFeatureGates = sets.New(
 	// never add to this list, if you think you have an exception ask @deads2k
 	"BuildCSIVolumes",
 	// never add to this list, if you think you have an exception ask @deads2k
-	"ChunkSizeMiB",
-	// never add to this list, if you think you have an exception ask @deads2k
 	"ClusterAPIInstall",
 	// never add to this list, if you think you have an exception ask @deads2k
 	"ClusterAPIInstallIBMCloud",

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

@@ -1,8 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "Config"
 crdName: configs.imageregistry.operator.openshift.io
-featureGates:
-- ChunkSizeMiB
 tests:
   onCreate:
     - name: Should be able to create a minimal Config

imageregistry/v1/types.go

@@ -215,7 +215,6 @@ type ImageRegistryConfigStorageS3 struct {
 	// The minimum value is 5 and the maximum value is 5120 (5 GiB).
 	// +kubebuilder:validation:Minimum=5
 	// +kubebuilder:validation:Maximum=5120
-	// +openshift:enable:FeatureGate=ChunkSizeMiB
 	// +optional
 	ChunkSizeMiB int32 `json:"chunkSizeMiB,omitempty"`
 	// encrypt specifies whether the registry stores the image in encrypted

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

@@ -4,8 +4,7 @@ configs.imageregistry.operator.openshift.io:
   CRDName: configs.imageregistry.operator.openshift.io
   Capability: ""
   Category: ""
-  FeatureGates:
-  - ChunkSizeMiB
+  FeatureGates: []
   FilenameOperatorName: ""
   FilenameOperatorOrdering: "00"
   FilenameRunLevel: ""

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

@@ -1468,6 +1468,18 @@ spec:
                           data.
                           Optional, will be generated if not provided.
                         type: string
+                      chunkSizeMiB:
+                        description: |-
+                          chunkSizeMiB defines the size of the multipart upload chunks of the S3 API.
+                          The S3 API requires multipart upload chunks to be at least 5MiB.
+                          When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
+                          The current default value is 10 MiB.
+                          The value is an integer number of MiB.
+                          The minimum value is 5 and the maximum value is 5120 (5 GiB).
+                        format: int32
+                        maximum: 5120
+                        minimum: 5
+                        type: integer
                       cloudFront:
                         description: |-
                           cloudFront configures Amazon Cloudfront as the storage middleware in a
@@ -2212,6 +2224,18 @@ spec:
                           data.
                           Optional, will be generated if not provided.
                         type: string
+                      chunkSizeMiB:
+                        description: |-
+                          chunkSizeMiB defines the size of the multipart upload chunks of the S3 API.
+                          The S3 API requires multipart upload chunks to be at least 5MiB.
+                          When omitted, this means no opinion and the platform is left to choose a reasonable default, which is subject to change over time.
+                          The current default value is 10 MiB.
+                          The value is an integer number of MiB.
+                          The minimum value is 5 and the maximum value is 5120 (5 GiB).
+                        format: int32
+                        maximum: 5120
+                        minimum: 5
+                        type: integer
                       cloudFront:
                         description: |-
                           cloudFront configures Amazon Cloudfront as the storage middleware in a