diff --git a/helm-chart/renku/templates/notebooks/env-secret.yaml b/helm-chart/renku/templates/notebooks/env-secret.yaml index 496d687d4d..a7cd3094c4 100644 --- a/helm-chart/renku/templates/notebooks/env-secret.yaml +++ b/helm-chart/renku/templates/notebooks/env-secret.yaml @@ -22,6 +22,7 @@ stringData: NB_SESSIONS__OIDC__TOKEN_URL: {{ .Values.notebooks.oidc.tokenUrl | default (printf "https://%s/auth/realms/Renku/protocol/openid-connect/token" .Values.global.renku.domain) }} NB_SESSIONS__OIDC__ISSUER_URL: {{ template "renku.keycloakIssuerUrl" . }} NB_SESSIONS__OIDC__ALLOW_UNVERIFIED_EMAIL: {{ .Values.notebooks.oidc.allowUnverifiedEmail | quote }} + NB_SESSIONS__INGRESS__CLASSNAME: {{ .Values.notebooks.sessionIngress.className | default "" }} NB_SESSIONS__INGRESS__HOST: {{ .Values.notebooks.sessionIngress.host | default .Values.global.renku.domain }} NB_SESSIONS__INGRESS__TLS_SECRET: {{ .Values.notebooks.sessionIngress.tlsSecret | default (printf "%s-ch-tls" .Release.Name) }} NB_SESSIONS__INGRESS__ANNOTATIONS: | diff --git a/helm-chart/renku/values.yaml b/helm-chart/renku/values.yaml index c7a41996ec..828c498396 100644 --- a/helm-chart/renku/values.yaml +++ b/helm-chart/renku/values.yaml @@ -210,10 +210,10 @@ global: ingress: ## Enables the creation of an ingress enabled: false - className: "" # nginx + ## The ingress class, e.g. "nginx" + className: "" ## Annotations for the created ingress annotations: - ## The ingress class cert-manager.io/cluster-issuer: letsencrypt-production # Use null as value if not using cert-manager to remove this entry nginx.ingress.kubernetes.io/proxy-body-size: "0" # Adjust to a reasonable value for production to avoid DOS attacks. nginx.ingress.kubernetes.io/proxy-request-buffering: "off" # Needed if GitLab is behind this ingress @@ -889,10 +889,11 @@ notebooks: authUrl: allowUnverifiedEmail: false sessionIngress: + ## The ingress class, e.g. "nginx" + className: "" host: tlsSecret: annotations: - kubernetes.io/ingress.class: nginx nginx.ingress.kubernetes.io/proxy-body-size: "0" nginx.ingress.kubernetes.io/proxy-buffer-size: 8k nginx.ingress.kubernetes.io/proxy-request-buffering: "off" diff --git a/minimal-deployment/minimal-deployment-values.yaml b/minimal-deployment/minimal-deployment-values.yaml index 9b25cae53d..6e85e31772 100644 --- a/minimal-deployment/minimal-deployment-values.yaml +++ b/minimal-deployment/minimal-deployment-values.yaml @@ -36,8 +36,7 @@ notebooks: values: - user sessionIngress: - annotations: - kubernetes.io/ingress.class: webapprouting.kubernetes.azure.com + className: webapprouting.kubernetes.azure.com sessionTolerations: - effect: NoSchedule key: renku.io/dedicated