From 837673b808c74ae6c7c8c7d3d4664014c6ec3d80 Mon Sep 17 00:00:00 2001
From: Bruno Salzano <d4rkstar@gmail.com>
Date: Sat, 20 Sep 2025 08:51:14 +0200
Subject: [PATCH] feat: ingressclass config

Added ingressclass config as specified in issue #173
---
 config/docopts.md           |  3 +++
 config/opsfile.yml          | 14 ++++++++++++--
 setup/kubernetes/whisk.yaml |  1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/config/docopts.md b/config/docopts.md
index a41be77e..2549b82f 100644
--- a/config/docopts.md
+++ b/config/docopts.md
@@ -31,6 +31,7 @@ Usage:
   config mail  [--mailuser=<mailuser>] [--mailpwd=<mailpwd>] [--mailfrom=<mailfrom>] [--mailto=<mailto>]
   config volumes [--couchdb=<couchdb>] [--kafka=<kafka>] [--pgvol=<postgres>] [--storage=<storage>] [--alerting=<alerting>] [--zookeeper=<zookeeper>] [--redisvol=<redis>] [--mongodbvol=<mongodb>] [--etcdvol=<etcd>] [--mvvol=<milvus>] [--mvzookvol=<milvuszook>] [--pulsarjournalvol=<pulsarjournal>] [--pulsarledgelvol=<pulsarledge>]  
   config controller [--javaopts=<javaopts>] [--loglevel=<loglevel>] [--replicas=<replicas>]
+  config ingress [--class=<auto|nginx|traefik|public>]
   config invoker [--javaopts=<javaopts>] [--poolmemory=<poolmemory>] [--timeoutsrun=<timeoutsrun>] [--timeoutslogs=<timeoutslogs>] [--loglevel=<loglevel>] [--replicas=<replicas>]
   config limits [--time=<time>] [--memory=<memory>] [--sequencelength=<sequencelength>] [--perminute=<perminute>] [--concurrent=<concurrent>] [--triggerperminute=<triggerperminute>] [--activation_max_payload=<activation_max_payload>] [--blackbox_fraction=<blackbox_fraction>]
   config storage [--class=<storage_class>] [--provisioner=<storage_provisioner>]
@@ -63,6 +64,7 @@ Usage:
   config mail             configure Alert Manager over a gmail account
   config volumes          configure the volume size distinguished in 3 categories (openwhisk couchdb & kafka, database, minio storage, alerting, milvus)
   config controller       configure Openwhisk enterprise controller java options
+  config ingress          configure OpenServerless ingress class
   config invoker          configure Openwhisk enterprise invoker options
   config limits           configure Openwhisk actions limits
   config storage          allows to customize storage persistence class and provider
@@ -120,4 +122,5 @@ Usage:
   --quota               select quota checker module
   --milvus              select MILVUS vector database
   --registry            activate the support for a private image registry for custom actions (by default it will install one)
+  --class               specify the ingress class. It can be auto, traefik, nginx. On microk8s it should be public.
 ```
diff --git a/config/opsfile.yml b/config/opsfile.yml
index d8f92f0d..e4777962 100644
--- a/config/opsfile.yml
+++ b/config/opsfile.yml
@@ -1080,7 +1080,6 @@ tasks:
       then config MINIO_CONFIG_INGRESS_CONSOLE=true
       fi 
 
-
   etcd:
     silent: true
     cmds:
@@ -1158,7 +1157,6 @@ tasks:
             Specifies the volume size assigned to the image registry
           VAL: "{{.__disk}}"
           DEF: "50"
-                                      
 
   minimal:
     silent: true
@@ -1205,3 +1203,15 @@ tasks:
       config OPENWHISK_INVOKER_CONTAINER_POOL_MEMORY=6g
     - task: status
     - config CONFIGURED=true
+
+  ingress:
+    silent: true
+    cmds:
+    - task: read
+      vars:
+        MSG: "Ingress Class"
+        VAR: "OPERATOR_CONFIG_INGRESSCLASS"
+        HINT: | 
+              Specify the ingress class.
+        VAL: "{{.__class}}"
+        DEF: "auto"
\ No newline at end of file
diff --git a/setup/kubernetes/whisk.yaml b/setup/kubernetes/whisk.yaml
index de6b164c..859974ce 100644
--- a/setup/kubernetes/whisk.yaml
+++ b/setup/kubernetes/whisk.yaml
@@ -31,6 +31,7 @@ spec:
       slim: ${OPERATOR_CONFIG_SLIM:-false}
       affinity: ${OPERATOR_CONFIG_AFFINITY:-false}
       tolerations: ${OPERATOR_CONFIG_TOLERATIONS:-false}
+      ingressclass: ${OPERATOR_CONFIG_INGRESSCLASS:-auto}
       preload:
         only-apache: ${OPERATOR_CONFIG_PRELOAD_ONLY_APACHE:-true}    
   components: