Allow specifying spec.ingressClassName for hub ingress

Signed-off-by: Armin Gerten <[email protected]>
artifacthub · Nov 15, 2023 · 10c3191 · 10c3191
1 parent 2d4c934
commit 10c3191
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/charts/artifact-hub/Chart.yaml b/charts/artifact-hub/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: artifact-hub
 description: Artifact Hub is a web-based application that enables finding, installing, and publishing Kubernetes packages.
 type: application
-version: 1.16.1-2
+version: 1.16.1-3
 appVersion: 1.16.0
 kubeVersion: ">= 1.19.0-0"
 home: https://artifacthub.io

diff --git a/charts/artifact-hub/templates/hub_ingress.yaml b/charts/artifact-hub/templates/hub_ingress.yaml
@@ -14,6 +14,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- with .Values.hub.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
   {{- if .Values.hub.ingress.defaultBackendEnabled }}  
   defaultBackend:
     service:

diff --git a/charts/artifact-hub/values.schema.json b/charts/artifact-hub/values.schema.json
@@ -389,16 +389,7 @@
                         "annotations": {
                             "title": "Hub ingress annotations",
                             "type": "object",
-                            "properties": {
-                                "kubernetes.io/ingress.class": {
-                                    "title": "Hub ingress class",
-                                    "type": "string",
-                                    "default": "nginx"
-                                }
-                            },
-                            "required": [
-                                "kubernetes.io/ingress.class"
-                            ]
+                            "default": {}
                         },
                         "enabled": {
                             "title": "Enable Hub ingress",
@@ -410,6 +401,12 @@
                             "type": "object",
                             "default": {}
                         },
+                        "ingressClassName": {
+                            "title": "Hub ingress class",
+                            "description": "The ingress class used for `spec.ingressClassName`",
+                            "type": "string",
+                            "default": ""
+                        },
                         "defaultBackendEnabled": {
                             "title": "Enable default backend for Hub Ingress",
                             "type": "boolean",

diff --git a/charts/artifact-hub/values.yaml b/charts/artifact-hub/values.yaml
@@ -110,8 +110,8 @@ dbMigrator:
 hub:
   ingress:
     enabled: true
-    annotations:
-      kubernetes.io/ingress.class: nginx
+    ingressClassName: ""
+    annotations: {}
     extraLabels: {}
     defaultBackendEnabled: true
     rules: []