From 3f8d7b181c7f77ee5b894f6c1b95ce3433501b8d Mon Sep 17 00:00:00 2001 From: fcomte Date: Mon, 3 Oct 2022 07:48:08 +0000 Subject: [PATCH] ingress class name cloudshell --- charts/cloudshell/Chart.yaml | 2 +- charts/cloudshell/templates/ingress.yaml | 1 + charts/cloudshell/values.schema.json | 14 ++++++++++++++ charts/cloudshell/values.yaml | 6 +----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/charts/cloudshell/Chart.yaml b/charts/cloudshell/Chart.yaml index 1eecde41..930a9e65 100644 --- 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 index 0c30fbe8..6d366e6d 100644 --- 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 index 19388e3f..7140b6a9 100644 --- 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 index 21d2bd0b..a3895e93 100644 --- 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"