Expose chunkzie variable for S3 storage driver

openshift · Apr 29, 2024 · f40f769 · f40f769
1 parent f39cf2e
commit f40f769
Show file tree

Hide file tree

Showing 8 changed files with 9,520 additions and 1 deletion.
diff --git a/imageregistry/v1/types.go b/imageregistry/v1/types.go
@@ -200,6 +200,15 @@ type ImageRegistryConfigStorageS3 struct {
 	// Optional, defaults based on the Region that is provided.
 	// +optional
 	RegionEndpoint string `json:"regionEndpoint,omitempty"`
+	// 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.
+	// +kubebuilder:validation:Minimum=5
+	// +kubebuilder:validation:Maximum=5120
+	// +openshift:enable:FeatureGate=ChunkSize
+	// +optional
+	ChunkSizeMiB int32 `json:"chunkSizeMiB,omitempty"`
 	// encrypt specifies whether the registry stores the image in encrypted
 	// format or not.
 	// Optional, defaults to false.

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-CustomNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-CustomNoUpgrade.crd.yaml
diff --git a/...nerated.crd-manifests/00_configs.crd.yaml → ...crd-manifests/00_configs-Default.crd.yaml b/...nerated.crd-manifests/00_configs.crd.yaml → ...crd-manifests/00_configs-Default.crd.yaml
@@ -6,6 +6,7 @@ metadata:
     api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
+    release.openshift.io/feature-set: Default
   name: configs.imageregistry.operator.openshift.io
 spec:
   group: imageregistry.operator.openshift.io

diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-DevPreviewNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-DevPreviewNoUpgrade.crd.yaml
diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs-TechPreviewNoUpgrade.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs-TechPreviewNoUpgrade.crd.yaml
diff --git a/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml b/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml
@@ -4,7 +4,8 @@ configs.imageregistry.operator.openshift.io:
   CRDName: configs.imageregistry.operator.openshift.io
   Capability: ""
   Category: ""
-  FeatureGates: []
+  FeatureGates:
+  - ChunkSize
   FilenameOperatorName: ""
   FilenameOperatorOrdering: "00"
   FilenameRunLevel: ""

diff --git a/...ted.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSize.yaml b/...ted.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSize.yaml
diff --git a/imageregistry/v1/zz_generated.swagger_doc_generated.go b/imageregistry/v1/zz_generated.swagger_doc_generated.go