add minio.claimSize param to configure the size of the Minio PVC

halcyondude · Aug 20, 2021 · f89ba6f · f89ba6f
1 parent 7ddaafc
commit f89ba6f
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 5 deletions.
diff --git a/addons/minio/2020-01-25T02-50-51Z/install.sh b/addons/minio/2020-01-25T02-50-51Z/install.sh
@@ -4,6 +4,10 @@ function minio_pre_init() {
     if [ -z "$MINIO_NAMESPACE" ]; then
         MINIO_NAMESPACE=minio
     fi
+
+    if [ -z "$MINIO_CLAIM_SIZE" ]; then
+        MINIO_CLAIM_SIZE="10Gi"
+    fi
 }
 
 function minio() {
@@ -20,7 +24,7 @@ function minio() {
         render_yaml_file "$src/tmpl-deployment-hostpath.yaml" > "$dst/deployment-hostpath.yaml"
         insert_patches_strategic_merge "$dst/kustomization.yaml" deployment-hostpath.yaml
     else
-        cp "$src/pvc.yaml" "$dst/"
+        render_yaml_file "$src/tmpl-pvc.yaml" > "$dst/pvc.yaml"
         insert_resources "$dst/kustomization.yaml" pvc.yaml
         render_yaml_file "$src/tmpl-deployment-pvc.yaml" > "$dst/deployment-pvc.yaml"
         insert_patches_strategic_merge "$dst/kustomization.yaml" deployment-pvc.yaml

diff --git a/addons/minio/2020-01-25T02-50-51Z/pvc.yaml → .../minio/2020-01-25T02-50-51Z/tmpl-pvc.yaml b/addons/minio/2020-01-25T02-50-51Z/pvc.yaml → .../minio/2020-01-25T02-50-51Z/tmpl-pvc.yaml
@@ -11,4 +11,4 @@ spec:
   resources:
     # This is the request for storage. Should be available in the cluster.
     requests:
-      storage: 10Gi
+      storage: ${MINIO_CLAIM_SIZE}
diff --git a/addons/minio/template/testgrid/k8s-docker.yaml b/addons/minio/template/testgrid/k8s-docker.yaml
@@ -36,3 +36,29 @@
     minio:
       version: "__testver__"
       s3Override: "__testdist__"
+
+- installerSpec:
+    kubernetes:
+      version: "latest"
+    weave:
+      version: "latest"
+    longhorn:
+      version: "latest"
+    containerd:
+      version: "latest"
+    minio:
+      version: "__testver__"
+#      claimSize: "20Gi"
+      s3Override: "__testdist__"
+
+- installerSpec:
+    kubernetes:
+      version: "latest"
+    weave:
+      version: "latest"
+    containerd:
+      version: "latest"
+    minio:
+      version: "__testver__"
+      hostPath: "/opt/minio"
+      s3Override: "__testdist__"
diff --git a/kurl_util/cmd/yamltobash/main.go b/kurl_util/cmd/yamltobash/main.go
@@ -233,6 +233,7 @@ func convertToBash(kurlValues map[string]interface{}, fieldsSet map[string]bool)
 		"MetricsServer.S3Override":               "METRICS_SERVER_S3_OVERRIDE",
 		"MetricsServer.Version":                  "METRICS_SERVER_VERSION",
 		"Minio.Namespace":                        "MINIO_NAMESPACE",
+		"Minio.ClaimSize":                        "MINIO_CLAIM_SIZE",
 		"Minio.S3Override":                       "MINIO_S3_OVERRIDE",
 		"Minio.HostPath":                         "MINIO_HOSTPATH",
 		"Minio.Version":                          "MINIO_VERSION",
@@ -335,13 +336,13 @@ func convertToBash(kurlValues map[string]interface{}, fieldsSet map[string]bool)
 		}
 
 		switch {
-		case yamlKey == "Kubernetes.LoadBalancerAddress" && bashVal != "" :
+		case yamlKey == "Kubernetes.LoadBalancerAddress" && bashVal != "":
 			finalDictionary["HA_CLUSTER"] = "1"
-		case yamlKey == "Kurl.Airgap" && bashVal != "" :
+		case yamlKey == "Kurl.Airgap" && bashVal != "":
 			finalDictionary["OFFLINE_DOCKER_INSTALL"] = "1"
 		case yamlKey == "Weave.PodCidrRange" || yamlKey == "Kubernetes.ServiceCidrRange" || yamlKey == "Antrea.PodCidrRange" && bashVal != "":
 			bashVal = strings.Replace(bashVal, "/", "", -1)
-		case yamlKey == "Docker.HardFailOnLoopback" && bashVal == "" && !fieldsSet[yamlKey] :
+		case yamlKey == "Docker.HardFailOnLoopback" && bashVal == "" && !fieldsSet[yamlKey]:
 			bashVal = "1"
 		case yamlKey == "Weave.NoMasqLocal":
 

diff --git a/kurlkinds/config/crds/v1beta1/cluster.kurl.sh_installers.yaml b/kurlkinds/config/crds/v1beta1/cluster.kurl.sh_installers.yaml
@@ -332,6 +332,8 @@ spec:
                 type: object
               minio:
                 properties:
+                  claimSize:
+                    type: string
                   hostPath:
                     type: string
                   namespace:

diff --git a/kurlkinds/pkg/apis/cluster/v1beta1/installer_types.go b/kurlkinds/pkg/apis/cluster/v1beta1/installer_types.go
@@ -124,6 +124,7 @@ type Kurl struct {
 }
 
 type Minio struct {
+	ClaimSize  string `json:"claimSize,omitempty" yaml:"claimSize,omitempty"`
 	Namespace  string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	S3Override string `json:"s3Override,omitempty" yaml:"s3Override,omitempty"`
 	HostPath   string `json:"hostPath,omitempty" yaml:"hostPath,omitempty"`

diff --git a/web/src/installers/index.ts b/web/src/installers/index.ts
@@ -225,6 +225,7 @@ export interface MinioConfig {
   s3Override?: string;
   namespace?: string;
   hostPath?: string;
+  claimSize?: string;
 }
 
 export const minioConfigSchema = {
@@ -234,6 +235,7 @@ export const minioConfigSchema = {
     s3Override: { type: "string", flag: "s3-override", description: "Override the download location for addon package distribution (used for CI/CD testing alpha addons)" },
     namespace: { type: "string", flag: "minio-namespace", description: "The namespace Minio is installed to" },
     hostPath: { type: "string", flag: "minio-hostpath", description: "Configure the minio deployment to use a local hostPath for storing data." },
+    claimSize: { type: "string", flag: "claim-size", description: "Configure the size of the Persistent Volume Claim that Minio will use, defaulting to 10Gi" },
   },
   required: ["version"],
   additionalProperties: false,