ingress class name cloudshell

InseeFrLab · Oct 3, 2022 · 3f8d7b1 · 3f8d7b1
1 parent a81a0e8
commit 3f8d7b1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/charts/cloudshell/Chart.yaml b/charts/cloudshell/Chart.yaml
@@ -20,7 +20,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 4.1.2
+version: 4.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/cloudshell/templates/ingress.yaml b/charts/cloudshell/templates/ingress.yaml
@@ -10,6 +10,7 @@ metadata:
   annotations:
     {{- include "library-chart.ingress.annotations" . | nindent 4 }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
 {{- if .Values.ingress.tls }}
   tls:
     - hosts:

diff --git a/charts/cloudshell/values.schema.json b/charts/cloudshell/values.schema.json
@@ -382,6 +382,20 @@
                         "hidden": true,
                         "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}.{{k8s.domain}}"
                     }
+                },
+                "ingressClassName": {
+                    "type": "string",
+                    "form": true,
+                    "title": "ingressClassName",
+                    "default": "",
+                    "x-form": {
+                        "hidden": true,
+                        "value": "{{k8s.ingressClassName}}"
+                    },
+                    "x-onyxia": {
+                        "hidden": true,
+                        "overwriteDefaultWith": "{{k8s.ingressClassName}}"
+                    }
                 }
             }
         },

diff --git a/charts/cloudshell/values.yaml b/charts/cloudshell/values.yaml
@@ -10,11 +10,7 @@ service:
 security:
   networkPolicy:
     enabled: false
-    from:
-      - ipBlock:
-          cidr: 10.233.103.0/32
-      - ipBlock:
-          cidr: 10.233.111.0/32
+    from: []
   allowlist:
     enabled: true
     ip: "0.0.0.0/0"