Skip to content

Commit 17212ae

Browse files
Merge pull request #170 from francescotimperi/3.0.0-testing-ftt
fix: using operator 3.1.0-mastrogpt.2410172007 with upload fixes
2 parents b49f497 + a8e8621 commit 17212ae

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

nuvroot.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"postgres": false
1414
},
1515
"images": {
16-
"operator": "ghcr.io/nuvolaris/nuvolaris-operator:3.1.0-mastrogpt.2403031745",
16+
"operator": "ghcr.io/nuvolaris/nuvolaris-operator:3.1.0-mastrogpt.2410172007",
1717
"controller": "ghcr.io/nuvolaris/openwhisk-controller:3.1.0-mastrogpt.2402101445"
1818
},
1919
"server": {

setup/kubernetes/crds/whisk-crd.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ spec:
324324
- acme-registered-email
325325
- acme-server-url
326326
minio:
327-
description: used to oconfigure the internal minio data storage service
327+
description: used to configure the internal minio data storage service
328328
type: object
329329
properties:
330330
volume-size:
@@ -352,6 +352,25 @@ spec:
352352
required:
353353
- user
354354
- password
355+
ingress:
356+
description: configuration option for global minio ingresses exposure
357+
type: object
358+
properties:
359+
s3-enabled:
360+
description: boolean flag to activate MINIO S3 compatible ingress. Default to false
361+
type: boolean
362+
s3-hostname:
363+
description: ingress hostname to be used if true (normally s3.<apihost>)
364+
type: string
365+
console-enabled:
366+
description: boolean flag to expose MINIO console
367+
type: boolean
368+
console-hostname:
369+
description: ingress hostname to be used (nora=mally minio.<apihost>)
370+
type: string
371+
required:
372+
- s3-enabled
373+
- console-enabled
355374
required:
356375
- volume-size
357376
- admin

setup/kubernetes/whisk.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,18 @@ spec:
128128
exposedExternally: False
129129
useOperator: False
130130
minio:
131-
volume-size: 2
131+
ingress:
132+
s3-enabled: ${MINIO_CONFIG_INGRESS_S3_ENABLED:-true}
133+
console-enabled: ${MINIO_CONFIG_INGRESS_CONSOLE_ENABLED:-false}
134+
s3-hostname: ${MINIO_CONFIG_INGRESS_S3_HOSTNAME:-auto}
135+
console-hostname: ${MINIO_CONFIG_INGRESS_CONSOLE_HOSTNAME:-auto}
136+
volume-size: ${NUVOLARIS_STORAGE_VOLUME_SIZE:-50}
132137
admin:
133138
user: minioadmin
134139
password: $SECRET_MINIO_ADMIN
135140
nuvolaris:
136141
user: nuvolaris
137-
password: $SECRET_MINIO_NUVOLARIS
142+
password: $SECRET_MINIO_NUVOLARIS
138143
postgres:
139144
volume-size: 5
140145
replicas: 2

0 commit comments

Comments
 (0)