fix: using operator 3.1.0-mastrogpt.2410172007 with upload supporting…

… DELETE method
nuvolaris · Oct 17, 2024 · 662c9b3 · 662c9b3
1 parent 3cafb85
commit 662c9b3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/nuvroot.json b/nuvroot.json
@@ -13,7 +13,7 @@
       "postgres": false
     },
     "images": {
-      "operator": "ghcr.io/nuvolaris/nuvolaris-operator:3.1.0-mastrogpt.2403031745",
+      "operator": "ghcr.io/nuvolaris/nuvolaris-operator:3.1.0-mastrogpt.2410172007",
       "controller": "ghcr.io/nuvolaris/openwhisk-controller:3.1.0-mastrogpt.2402101445"
     },
     "server": {

diff --git a/setup/kubernetes/crds/whisk-crd.yaml b/setup/kubernetes/crds/whisk-crd.yaml
@@ -324,7 +324,7 @@ spec:
                   - acme-registered-email
                   - acme-server-url
                 minio:
-                  description: used to oconfigure the internal minio data storage service
+                  description: used to configure the internal minio data storage service
                   type: object
                   properties:
                     volume-size:
@@ -352,6 +352,25 @@ spec:
                       required:
                       - user
                       - password
+                    ingress:
+                      description: configuration option for global minio ingresses exposure
+                      type: object
+                      properties:
+                        s3-enabled:
+                          description: boolean flag to activate MINIO S3 compatible ingress. Default to false
+                          type: boolean
+                        s3-hostname:
+                          description: ingress hostname to be used if true (normally s3.<apihost>)
+                          type: string
+                        console-enabled:
+                          description: boolean flag to expose MINIO console
+                          type: boolean
+                        console-hostname:
+                          description: ingress hostname to be used (nora=mally minio.<apihost>)
+                          type: string
+                      required:
+                      - s3-enabled
+                      - console-enabled                           
                   required:
                   - volume-size
                   - admin

diff --git a/setup/kubernetes/whisk.yaml b/setup/kubernetes/whisk.yaml
@@ -128,13 +128,18 @@ spec:
     exposedExternally: False
     useOperator: False
   minio:
-    volume-size: 2
+    ingress:
+      s3-enabled: ${MINIO_CONFIG_INGRESS_S3_ENABLED:-true}
+      console-enabled: ${MINIO_CONFIG_INGRESS_CONSOLE_ENABLED:-false}
+      s3-hostname: ${MINIO_CONFIG_INGRESS_S3_HOSTNAME:-auto}
+      console-hostname: ${MINIO_CONFIG_INGRESS_CONSOLE_HOSTNAME:-auto}
+    volume-size: ${NUVOLARIS_STORAGE_VOLUME_SIZE:-50}
     admin:
       user: minioadmin
       password: $SECRET_MINIO_ADMIN    
     nuvolaris:
       user: nuvolaris
-      password: $SECRET_MINIO_NUVOLARIS
+      password: $SECRET_MINIO_NUVOLARIS      
   postgres:    
     volume-size: 5
     replicas: 2