diff --git a/charts/ubuntu/Chart.yaml b/charts/ubuntu/Chart.yaml index c7d1986f..839f2c30 100644 --- a/charts/ubuntu/Chart.yaml +++ b/charts/ubuntu/Chart.yaml @@ -22,7 +22,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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 5.2.0 +version: 5.3.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. Versions are not expected to diff --git a/charts/ubuntu/templates/ingress-user.yaml b/charts/ubuntu/templates/ingress-user.yaml index c3d345da..43941729 100644 --- a/charts/ubuntu/templates/ingress-user.yaml +++ b/charts/ubuntu/templates/ingress-user.yaml @@ -11,6 +11,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/ubuntu/templates/ingress.yaml b/charts/ubuntu/templates/ingress.yaml index e0e96863..7964bd32 100644 --- a/charts/ubuntu/templates/ingress.yaml +++ b/charts/ubuntu/templates/ingress.yaml @@ -12,6 +12,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" {{- include "library-chart.ingress.annotations" . | nindent 4 }} spec: + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} {{- if .Values.ingress.tls }} tls: - hosts: diff --git a/charts/ubuntu/values.schema.json b/charts/ubuntu/values.schema.json index cbf91449..4c24aa84 100644 --- a/charts/ubuntu/values.schema.json +++ b/charts/ubuntu/values.schema.json @@ -216,6 +216,28 @@ "x-onyxia": { "overwriteDefaultWith": "region.defaultNetworkPolicy" } + }, + "from": { + "type": "array", + "description": "Array of source allowed to have network access to your service", + "default" : [ + { + "ipBlock": { + "cidr": "10.233.103.0/32" + } + }, + { + "ipBlock": { + "cidr": "10.233.111.0/32" + } + } + ], + "x-form": { + "value": "{{region.from}}" + }, + "x-onyxia": { + "overwriteDefaultWith": "region.from" + } } } } @@ -528,6 +550,20 @@ "hidden": true, "overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{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/ubuntu/values.yaml b/charts/ubuntu/values.yaml index 5eb20cbe..7ae7ab30 100644 --- a/charts/ubuntu/values.yaml +++ b/charts/ubuntu/values.yaml @@ -13,11 +13,7 @@ security: password: "changeme" 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"