Skip to content

feat: add Gateway API HTTPRoute support for Onyxia integration #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bafbi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add Gateway API HTTPRoute support for Onyxia integration #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/jupyter-pyspark/templates/httproute-sparkui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.httprouteSpark" . }}
1 change: 1 addition & 0 deletions charts/jupyter-pyspark/templates/httproute-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.httprouteUser" . }}
1 change: 1 addition & 0 deletions charts/jupyter-pyspark/templates/httproute.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.httproute" . }}
85 changes: 82 additions & 3 deletions charts/jupyter-pyspark/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,85 @@
}
}
},
"httproute": {
"title": "HTTPRoute Details",
"type": "object",
"form": true,
"x-onyxia": {
"overwriteSchemaWith": "ide/httproute.json"
},
"properties": {
"enabled": {
"description": "Enable HTTPRoute",
"type": "boolean",
"default": false,
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "k8s.httpRoute.enabled"
}
},
"hostname": {
"type": "string",
"form": true,
"title": "Hostname",
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
}
},
"userHostname": {
"type": "string",
"form": true,
"title": "Hostname",
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
}
},
"path": {
"type": "string",
"form": true,
"title": "Path",
"default": "/"
},
"userPath": {
"type": "string",
"form": true,
"title": "User Path",
"default": "/"
},
"parentRefs": {
"description": "Gateway parent references",
"type": "array",
"default": [],
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "k8s.httpRoute.parentRefs"
},
"items": {
"type": "object",
"properties": {
"name": {
"type": "string",
"title": "Gateway name"
},
"namespace": {
"type": "string",
"title": "Gateway namespace"
},
"sectionName": {
"type": "string",
"title": "Listener name"
},
"port": {
"type": "integer",
"title": "Listener port"
}
}
}
}
}
},
"userPreferences": {
"description": "User Preferences",
"type": "object",
Expand Down Expand Up @@ -1148,7 +1227,7 @@
"properties": {
"fr": {
"type": "string",
"description": "message à ajouter dans les notes",
"description": "message \u00e0 ajouter dans les notes",
"default": ""
},
"en": {
Expand All @@ -1158,7 +1237,7 @@
}
}
},
"runtimeClassName" : {
"runtimeClassName": {
"type": "string",
"description": "Runtime Class Name",
"default": "",
Expand All @@ -1168,4 +1247,4 @@
}
}
}
}
}
12 changes: 12 additions & 0 deletions charts/jupyter-pyspark/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,18 @@ route:
# destinationCACertificate:
wildcardPolicy: None

httproute:
enabled: false
annotations: []
hostname: chart-example.local
userHostname: chart-example-user.local
path: /
userPath: /
parentRefs: []
# - name: my-gateway
# namespace: gateway-system
# sectionName: http

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
1 change: 1 addition & 0 deletions charts/jupyter-python/templates/httproute-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.httprouteUser" . }}
1 change: 1 addition & 0 deletions charts/jupyter-python/templates/httproute.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ include "library-chart.httproute" . }}
79 changes: 79 additions & 0 deletions charts/jupyter-python/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,85 @@
}
}
},
"httproute": {
"title": "HTTPRoute Details",
"type": "object",
"form": true,
"x-onyxia": {
"overwriteSchemaWith": "ide/httproute.json"
},
"properties": {
"enabled": {
"description": "Enable HTTPRoute",
"type": "boolean",
"default": false,
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "k8s.httpRoute.enabled"
}
},
"hostname": {
"type": "string",
"form": true,
"title": "Hostname",
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-0.{{k8s.domain}}"
}
},
"userHostname": {
"type": "string",
"form": true,
"title": "Hostname",
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "{{project.id}}-{{k8s.randomSubdomain}}-user.{{k8s.domain}}"
}
},
"path": {
"type": "string",
"form": true,
"title": "Path",
"default": "/"
},
"userPath": {
"type": "string",
"form": true,
"title": "User Path",
"default": "/"
},
"parentRefs": {
"description": "Gateway parent references",
"type": "array",
"default": [],
"x-onyxia": {
"hidden": true,
"overwriteDefaultWith": "k8s.httpRoute.parentRefs"
},
"items": {
"type": "object",
"properties": {
"name": {
"type": "string",
"title": "Gateway name"
},
"namespace": {
"type": "string",
"title": "Gateway namespace"
},
"sectionName": {
"type": "string",
"title": "Listener name"
},
"port": {
"type": "integer",
"title": "Listener port"
}
}
}
}
}
},
"repository": {
"description": "python repositories for pip and conda",
"type": "object",
Expand Down
12 changes: 12 additions & 0 deletions charts/jupyter-python/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,18 @@ route:
# destinationCACertificate:
wildcardPolicy: None

httproute:
enabled: false
annotations: []
hostname: chart-example.local
userHostname: chart-example-user.local
path: /
userPath: /
parentRefs: []
# - name: my-gateway
# namespace: gateway-system
# sectionName: http

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
6 changes: 6 additions & 0 deletions charts/library-chart/templates/_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
{{- define "library-chart.service-url" -}}
{{- if (.Values.ingress).enabled -}}
{{- printf "%s://%s" (.Values.ingress.tls | ternary "https" "http") .Values.ingress.hostname -}}
{{- else if (.Values.httproute).enabled -}}
{{- printf "https://%s" .Values.httproute.hostname -}}
{{- else if (.Values.route).enabled -}}
{{- printf "https://%s" .Values.route.hostname -}}
{{- end -}}
Expand All @@ -23,6 +25,8 @@
{{- if (.Values.spark).ui -}}
{{- if (.Values.ingress).enabled -}}
{{- printf "%s://%s" (.Values.ingress.tls | ternary "https" "http") .Values.spark.hostname -}}
{{- else if (.Values.httproute).enabled -}}
{{- printf "https://%s" .Values.spark.hostname -}}
{{- else if (.Values.route).enabled -}}
{{- printf "https://%s" .Values.spark.hostname -}}
{{- end -}}
Expand All @@ -35,6 +39,8 @@
{{- define "library-chart.user-url" -}}
{{- if (.Values.ingress).enabled -}}
{{- printf "%s://%s" (.Values.ingress.tls | ternary "https" "http") .Values.ingress.userHostname -}}
{{- else if (.Values.httproute).enabled -}}
{{- printf "https://%s" .Values.httproute.userHostname -}}
{{- else if (.Values.route).enabled -}}
{{- printf "https://%s" .Values.route.userHostname -}}
{{- end -}}
Expand Down
Loading