Update charts to 3.2.1 and make values.yaml match docs
This commit is contained in:
parent
6607a70cc1
commit
1b5d67408e
|
@ -1,24 +1,24 @@
|
||||||
annotations:
|
annotations:
|
||||||
artifacthub.io/images: |
|
artifacthub.io/images: |
|
||||||
- image: jupyterhub/configurable-http-proxy:4.5.6
|
- image: quay.io/jupyterhub/configurable-http-proxy:4.6.1
|
||||||
name: configurable-http-proxy
|
name: configurable-http-proxy
|
||||||
- image: jupyterhub/k8s-hub:3.0.3
|
- image: quay.io/jupyterhub/k8s-hub:3.2.1
|
||||||
name: k8s-hub
|
name: k8s-hub
|
||||||
- image: jupyterhub/k8s-image-awaiter:3.0.3
|
- image: quay.io/jupyterhub/k8s-image-awaiter:3.2.1
|
||||||
name: k8s-image-awaiter
|
name: k8s-image-awaiter
|
||||||
- image: jupyterhub/k8s-network-tools:3.0.3
|
- image: quay.io/jupyterhub/k8s-network-tools:3.2.1
|
||||||
name: k8s-network-tools
|
name: k8s-network-tools
|
||||||
- image: jupyterhub/k8s-secret-sync:3.0.3
|
- image: quay.io/jupyterhub/k8s-secret-sync:3.2.1
|
||||||
name: k8s-secret-sync
|
name: k8s-secret-sync
|
||||||
- image: jupyterhub/k8s-singleuser-sample:3.0.3
|
- image: quay.io/jupyterhub/k8s-singleuser-sample:3.2.1
|
||||||
name: k8s-singleuser-sample
|
name: k8s-singleuser-sample
|
||||||
- image: registry.k8s.io/kube-scheduler:v1.26.8
|
- image: registry.k8s.io/kube-scheduler:v1.26.11
|
||||||
name: kube-scheduler
|
name: kube-scheduler
|
||||||
- image: registry.k8s.io/pause:3.9
|
- image: registry.k8s.io/pause:3.9
|
||||||
name: pause
|
name: pause
|
||||||
- image: registry.k8s.io/pause:3.9
|
- image: registry.k8s.io/pause:3.9
|
||||||
name: pause
|
name: pause
|
||||||
- image: traefik:v2.10.4
|
- image: traefik:v2.10.5
|
||||||
name: traefik
|
name: traefik
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: 4.0.2
|
appVersion: 4.0.2
|
||||||
|
@ -38,4 +38,4 @@ maintainers:
|
||||||
name: jupyterhub
|
name: jupyterhub
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/jupyterhub/zero-to-jupyterhub-k8s
|
- https://github.com/jupyterhub/zero-to-jupyterhub-k8s
|
||||||
version: 3.0.3
|
version: 3.2.1
|
||||||
|
|
|
@ -134,6 +134,7 @@ spec:
|
||||||
{{- /* --- Conditionally pull profileList images --- */}}
|
{{- /* --- Conditionally pull profileList images --- */}}
|
||||||
{{- if .Values.prePuller.pullProfileListImages }}
|
{{- if .Values.prePuller.pullProfileListImages }}
|
||||||
{{- range $k, $container := .Values.singleuser.profileList }}
|
{{- range $k, $container := .Values.singleuser.profileList }}
|
||||||
|
{{- /* profile's kubespawner_override */}}
|
||||||
{{- if $container.kubespawner_override }}
|
{{- if $container.kubespawner_override }}
|
||||||
{{- if $container.kubespawner_override.image }}
|
{{- if $container.kubespawner_override.image }}
|
||||||
- name: image-pull-singleuser-profilelist-{{ $k }}
|
- name: image-pull-singleuser-profilelist-{{ $k }}
|
||||||
|
@ -152,6 +153,33 @@ spec:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- /* kubespawner_override in profile's profile_options */}}
|
||||||
|
{{- if $container.profile_options }}
|
||||||
|
{{- range $option, $option_spec := $container.profile_options }}
|
||||||
|
{{- if $option_spec.choices }}
|
||||||
|
{{- range $choice, $choice_spec := $option_spec.choices }}
|
||||||
|
{{- if $choice_spec.kubespawner_override }}
|
||||||
|
{{- if $choice_spec.kubespawner_override.image }}
|
||||||
|
- name: image-pull-profile-{{ $k }}-option-{{ $option }}-{{ $choice }}
|
||||||
|
image: {{ $choice_spec.kubespawner_override.image }}
|
||||||
|
command:
|
||||||
|
- /bin/sh
|
||||||
|
- -c
|
||||||
|
- echo "Pulling complete"
|
||||||
|
{{- with $.Values.prePuller.resources }}
|
||||||
|
resources:
|
||||||
|
{{- . | toYaml | nindent 12 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with $.Values.prePuller.containerSecurityContext }}
|
||||||
|
securityContext:
|
||||||
|
{{- . | toYaml | nindent 12 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|
|
@ -83,8 +83,8 @@ hub:
|
||||||
extraVolumes: []
|
extraVolumes: []
|
||||||
extraVolumeMounts: []
|
extraVolumeMounts: []
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/k8s-hub
|
name: quay.io/jupyterhub/k8s-hub
|
||||||
tag: "3.0.3"
|
tag: "3.2.1"
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
resources: {}
|
resources: {}
|
||||||
|
@ -201,11 +201,11 @@ proxy:
|
||||||
runAsGroup: 65534 # nobody group
|
runAsGroup: 65534 # nobody group
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/configurable-http-proxy
|
name: quay.io/jupyterhub/configurable-http-proxy
|
||||||
# tag is automatically bumped to new patch versions by the
|
# tag is automatically bumped to new patch versions by the
|
||||||
# watch-dependencies.yaml workflow.
|
# watch-dependencies.yaml workflow.
|
||||||
#
|
#
|
||||||
tag: "4.5.6" # https://github.com/jupyterhub/configurable-http-proxy/tags
|
tag: "4.6.1" # https://github.com/jupyterhub/configurable-http-proxy/tags
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
extraCommandLineFlags: []
|
extraCommandLineFlags: []
|
||||||
|
@ -258,7 +258,7 @@ proxy:
|
||||||
# tag is automatically bumped to new patch versions by the
|
# tag is automatically bumped to new patch versions by the
|
||||||
# watch-dependencies.yaml workflow.
|
# watch-dependencies.yaml workflow.
|
||||||
#
|
#
|
||||||
tag: "v2.10.4" # ref: https://hub.docker.com/_/traefik?tab=tags
|
tag: "v2.10.5" # ref: https://hub.docker.com/_/traefik?tab=tags
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
hsts:
|
hsts:
|
||||||
|
@ -304,8 +304,8 @@ proxy:
|
||||||
runAsGroup: 65534 # nobody group
|
runAsGroup: 65534 # nobody group
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/k8s-secret-sync
|
name: quay.io/jupyterhub/k8s-secret-sync
|
||||||
tag: "3.0.3"
|
tag: "3.2.1"
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
resources: {}
|
resources: {}
|
||||||
|
@ -344,8 +344,8 @@ singleuser:
|
||||||
preferred: []
|
preferred: []
|
||||||
networkTools:
|
networkTools:
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/k8s-network-tools
|
name: quay.io/jupyterhub/k8s-network-tools
|
||||||
tag: "3.0.3"
|
tag: "3.2.1"
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
resources: {}
|
resources: {}
|
||||||
|
@ -396,8 +396,8 @@ singleuser:
|
||||||
volumeNameTemplate: volume-{username}{servername}
|
volumeNameTemplate: volume-{username}{servername}
|
||||||
storageAccessModes: [ReadWriteOnce]
|
storageAccessModes: [ReadWriteOnce]
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/k8s-singleuser-sample
|
name: quay.io/jupyterhub/k8s-singleuser-sample
|
||||||
tag: "3.0.3"
|
tag: "3.2.1"
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
startTimeout: 300
|
startTimeout: 300
|
||||||
|
@ -519,7 +519,7 @@ scheduling:
|
||||||
# here. We aim to stay around 1 minor version behind the latest k8s
|
# here. We aim to stay around 1 minor version behind the latest k8s
|
||||||
# version.
|
# version.
|
||||||
#
|
#
|
||||||
tag: "v1.26.8" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
|
tag: "v1.26.11" # ref: https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
nodeSelector: {}
|
nodeSelector: {}
|
||||||
|
@ -605,8 +605,8 @@ prePuller:
|
||||||
pullOnlyOnChanges: true
|
pullOnlyOnChanges: true
|
||||||
# image and the configuration below relates to the hook-image-awaiter Job
|
# image and the configuration below relates to the hook-image-awaiter Job
|
||||||
image:
|
image:
|
||||||
name: jupyterhub/k8s-image-awaiter
|
name: quay.io/jupyterhub/k8s-image-awaiter
|
||||||
tag: "3.0.3"
|
tag: "3.2.1"
|
||||||
pullPolicy:
|
pullPolicy:
|
||||||
pullSecrets: []
|
pullSecrets: []
|
||||||
containerSecurityContext:
|
containerSecurityContext:
|
||||||
|
|
|
@ -11,16 +11,16 @@ hub:
|
||||||
storageClassName: csi-sc-cinderplugin
|
storageClassName: csi-sc-cinderplugin
|
||||||
extraConfig:
|
extraConfig:
|
||||||
oauthCode: |
|
oauthCode: |
|
||||||
from oauthenticator.generic import GenericOAuthenticator
|
c.JupyterHub.authenticator_class = "generic-oauth"
|
||||||
c.JupyterHub.authenticator_class = GenericOAuthenticator
|
|
||||||
c.GenericOAuthenticator.client_id = os.environ['NEXTCLOUD_CLIENT_ID']
|
c.GenericOAuthenticator.client_id = os.environ['NEXTCLOUD_CLIENT_ID']
|
||||||
c.GenericOAuthenticator.client_secret = os.environ['NEXTCLOUD_CLIENT_ID']
|
c.GenericOAuthenticator.client_secret = os.environ['NEXTCLOUD_CLIENT_ID']
|
||||||
c.GenericOAuthenticator.login_service = 'Sunet Drive'
|
c.GenericOAuthenticator.login_service = 'Sunet Drive'
|
||||||
c.GenericOAuthenticator.username_key = lambda r: r.get('ocs', {}).get('data', {}).get('id')
|
c.GenericOAuthenticator.username_claim = lambda r: r.get('ocs', {}).get('data', {}).get('id')
|
||||||
c.GenericOAuthenticator.userdata_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/ocs/v2.php/cloud/user?format=json'
|
|
||||||
c.GenericOAuthenticator.authorize_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/authorize'
|
c.GenericOAuthenticator.authorize_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/authorize'
|
||||||
c.GenericOAuthenticator.token_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token'
|
c.GenericOAuthenticator.token_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/index.php/apps/oauth2/api/v1/token'
|
||||||
c.GenericOAuthenticator.oauth_callback_url = 'https://' + os.environ['JUPYTER_HOST'] + '/hub/oauth_callback'
|
c.GenericOAuthenticator.userdata_url = 'https://' + os.environ['NEXTCLOUD_HOST'] + '/ocs/v2.php/cloud/user?format=json'
|
||||||
|
# c.GenericOAuthenticator.oauth_callback_url = 'https://' + os.environ['JUPYTER_HOST'] + '/hub/oauth_callback'
|
||||||
|
|
||||||
extraEnv:
|
extraEnv:
|
||||||
NEXTCLOUD_HOST: sunet.drive.test.sunet.se
|
NEXTCLOUD_HOST: sunet.drive.test.sunet.se
|
||||||
|
@ -35,6 +35,8 @@ hub:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: nextcloud-oauth-secrets
|
name: nextcloud-oauth-secrets
|
||||||
key: client-secret
|
key: client-secret
|
||||||
|
networkPolicy:
|
||||||
|
enabled: false
|
||||||
|
|
||||||
singleuser:
|
singleuser:
|
||||||
image:
|
image:
|
||||||
|
|
Loading…
Reference in a new issue