Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 14:57:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/jupyterhub] Chart standardized (#9330)

Browse Source 
* [bitnami/jupyterhub] Chart standardized

Signed-off-by: juan131 <juanariza@vmware.com>

* Implement serviceMonitor.selector

Signed-off-by: juan131 <juanariza@vmware.com>

* [bitnami/jupyterhub] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Juan Ariza Toledano
2022-03-08 12:55:53 +01:00
committed by GitHub
parent e6683a3164
commit d06594fb9e
26 changed files with 1146 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitnami/jupyterhub/Chart.lock
View File

@@ -1,9 +1,9 @@
dependencies: dependencies:
- name: postgresql - name: postgresql
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami
version: 11.1.3 version: 11.1.4
- name: common - name: common
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami
version: 1.11.3 version: 1.11.3
digest: sha256:59d28ebb1e7caa4862a9892c8eebf2f28e593292d756c5e48b4ec12d7e4c0571 digest: sha256:0fc4c1a4f98fe10a226266b775c3a3feec858336fce8bc89dc7502c680a9ad97
generated: "2022-03-04T15:37:28.696424984Z" generated: "2022-03-08T10:28:09.616286+01:00"

2
bitnami/jupyterhub/Chart.yaml
View File

@@ -26,4 +26,4 @@ name: jupyterhub
sources: sources:
- https://github.com/bitnami/bitnami-docker-jupyterhub - https://github.com/bitnami/bitnami-docker-jupyterhub
- https://github.com/jupyterhub/jupyterhub - https://github.com/jupyterhub/jupyterhub
version: 1.0.2 version: 1.1.0

594
bitnami/jupyterhub/README.md
View File

@@ -7,7 +7,7 @@ JupyterHub brings the power of notebooks to groups of users. It gives users acce
[Overview of JupyterHub](https://jupyter.org/hub) [Overview of JupyterHub](https://jupyter.org/hub)
Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement. Trademarks: This software listing is packaged by Bitnami. The respective trademarks mentioned in the offering are owned by the respective companies, and use of them does not imply any affiliation or endorsement.
## TL;DR ## TL;DR
```console ```console
@@ -64,193 +64,222 @@ The command removes all the Kubernetes components associated with the chart and
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` | | `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` | | `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
### Common parameters ### Common parameters
| Name | Description | Value | | Name | Description | Value |
| ------------------- | ----------------------------------------------------------------------------------- | ----- | | ------------------------ | --------------------------------------------------------------------------------------- | --------------- |
| `kubeVersion` | Override Kubernetes version | `""` | | `kubeVersion` | Override Kubernetes version | `""` |
| `nameOverride` | String to partially override common.names.fullname (will maintain the release name) | `""` | | `nameOverride` | String to partially override common.names.fullname (will maintain the release name) | `""` |
| `fullnameOverride` | String to fully override common.names.fullname | `""` | | `fullnameOverride` | String to fully override common.names.fullname | `""` |
| `commonLabels` | Labels to add to all deployed objects | `{}` | | `clusterDomain` | Kubernetes Cluster Domain | `cluster.local` |
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` | | `commonLabels` | Labels to add to all deployed objects | `{}` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` | | `commonAnnotations` | Annotations to add to all deployed objects | `{}` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` |
| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` |
| `diagnosticMode.command` | Command to override all containers in the the deployment(s)/daemonset(s) | `["sleep"]` |
| `diagnosticMode.args` | Args to override all containers in the the deployment(s)/daemonset(s) | `["infinity"]` |
### Hub deployment parameters ### Hub deployment parameters
| Name | Description | Value | | Name | Description | Value |
| ------------------------------------------- | ----------------------------------------------------------------------------------------- | ---------------------- | | ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | ---------------------- |
| `hub.image.registry` | Hub image registry | `docker.io` | | `hub.image.registry` | Hub image registry | `docker.io` |
| `hub.image.repository` | Hub image repository | `bitnami/jupyterhub` | | `hub.image.repository` | Hub image repository | `bitnami/jupyterhub` |
| `hub.image.tag` | Hub image tag (immutabe tags are recommended) | `1.5.0-debian-10-r105` | | `hub.image.tag` | Hub image tag (immutable tags are recommended) | `1.5.0-debian-10-r107` |
| `hub.image.pullPolicy` | Hub image pull policy | `IfNotPresent` | | `hub.image.pullPolicy` | Hub image pull policy | `IfNotPresent` |
| `hub.image.pullSecrets` | Hub image pull secrets | `[]` | | `hub.image.pullSecrets` | Hub image pull secrets | `[]` |
| `hub.startupProbe.enabled` | Enable startupProbe | `true` | | `hub.baseUrl` | Hub base URL | `/` |
| `hub.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | | `hub.adminUser` | Hub Dummy authenticator admin user | `user` |
| `hub.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | | `hub.password` | Hub Dummy authenticator password | `""` |
| `hub.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `3` | | `hub.configuration` | Hub configuration file (to be used by jupyterhub_config.py) | `""` |
| `hub.startupProbe.failureThreshold` | Failure threshold for startupProbe | `30` | | `hub.existingConfigmap` | Configmap with Hub init scripts (replaces the scripts in templates/hub/configmap.yml) | `""` |
| `hub.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | | `hub.existingSecret` | Secret with hub configuration (replaces the hub.configuration value) and proxy token | `""` |
| `hub.livenessProbe.enabled` | Enable livenessProbe | `true` | | `hub.command` | Override Hub default command | `[]` |
| `hub.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | | `hub.args` | Override Hub default args | `[]` |
| `hub.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | | `hub.extraEnvVars` | Add extra environment variables to the Hub container | `[]` |
| `hub.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `3` | | `hub.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` |
| `hub.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `30` | | `hub.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` |
| `hub.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | | `hub.containerPorts.http` | Hub container port | `8081` |
| `hub.readinessProbe.enabled` | Enable readinessProbe | `true` | | `hub.startupProbe.enabled` | Enable startupProbe on Hub containers | `true` |
| `hub.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` | | `hub.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` |
| `hub.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | | `hub.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` |
| `hub.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` | | `hub.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `3` |
| `hub.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `30` | | `hub.startupProbe.failureThreshold` | Failure threshold for startupProbe | `30` |
| `hub.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | | `hub.startupProbe.successThreshold` | Success threshold for startupProbe | `1` |
| `hub.baseUrl` | Hub base URL | `/` | | `hub.livenessProbe.enabled` | Enable livenessProbe on Hub containers | `true` |
| `hub.adminUser` | Hub Dummy authenticator admin user | `user` | | `hub.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` |
| `hub.password` | Hub Dummy authenticator password | `""` | | `hub.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |
| `hub.configuration` | Hub configuration file (to be used by jupyterhub_config.py) | `""` | | `hub.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `3` |
| `hub.containerPort` | Hub container port | `8081` | | `hub.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `30` |
| `hub.existingConfigmap` | Configmap with Hub init scripts (replaces the scripts in templates/hub/configmap.yml) | `""` | | `hub.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `hub.existingSecret` | Secret with hub configuration (replaces the hub.configuration value) and proxy token | `""` | | `hub.readinessProbe.enabled` | Enable readinessProbe on Hub containers | `true` |
| `hub.command` | Override Hub default command | `[]` | | `hub.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` |
| `hub.args` | Override Hub default args | `[]` | | `hub.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` |
| `hub.pdb.create` | Deploy Hub PodDisruptionBudget | `false` | | `hub.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` |
| `hub.pdb.minAvailable` | Set minimum available hub instances | `""` | | `hub.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `30` |
| `hub.pdb.maxUnavailable` | Set maximum available hub instances | `""` | | `hub.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `hub.priorityClassName` | Hub pod priority class name | `""` | | `hub.customStartupProbe` | Override default startup probe | `{}` |
| `hub.hostAliases` | Add deployment host aliases | `[]` | | `hub.customLivenessProbe` | Override default liveness probe | `{}` |
| `hub.resources.limits` | The resources limits for the container | `{}` | | `hub.customReadinessProbe` | Override default readiness probe | `{}` |
| `hub.resources.requests` | The requested resources for the container | `{}` | | `hub.resources.limits` | The resources limits for the Hub containers | `{}` |
| `hub.containerSecurityContext.enabled` | Enabled Hub containers' Security Context | `true` | | `hub.resources.requests` | The requested resources for the Hub containers | `{}` |
| `hub.containerSecurityContext.runAsUser` | Set Hub container's Security Context runAsUser | `1000` | | `hub.containerSecurityContext.enabled` | Enabled Hub containers' Security Context | `true` |
| `hub.containerSecurityContext.runAsNonRoot` | Set Hub container's Security Context runAsNonRoot | `true` | | `hub.containerSecurityContext.runAsUser` | Set Hub container's Security Context runAsUser | `1000` |
| `hub.podSecurityContext.enabled` | Enabled Hub pods' Security Context | `true` | | `hub.containerSecurityContext.runAsNonRoot` | Set Hub container's Security Context runAsNonRoot | `true` |
| `hub.podSecurityContext.fsGroup` | Set Hub pod's Security Context fsGroup | `1001` | | `hub.podSecurityContext.enabled` | Enabled Hub pods' Security Context | `true` |
| `hub.podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `hub.podSecurityContext.fsGroup` | Set Hub pod's Security Context fsGroup | `1001` |
| `hub.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | | `hub.lifecycleHooks` | LifecycleHooks for the Hub container to automate configuration before or after startup | `{}` |
| `hub.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `hub.hostAliases` | Add deployment host aliases | `[]` |
| `hub.nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set | `""` | | `hub.podLabels` | Add extra labels to the Hub pods | `{}` |
| `hub.nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set | `[]` | | `hub.podAnnotations` | Add extra annotations to the Hub pods | `{}` |
| `hub.affinity` | Affinity for pod assignment. | `{}` | | `hub.podAffinityPreset` | Pod affinity preset. Ignored if `hub.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `hub.nodeSelector` | Node labels for pod assignment. | `{}` | | `hub.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `hub.affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `hub.tolerations` | Tolerations for pod assignment. | `[]` | | `hub.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `hub.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `hub.podLabels` | Pod extra labels | `{}` | | `hub.nodeAffinityPreset.key` | Node label key to match. Ignored if `hub.affinity` is set | `""` |
| `hub.podAnnotations` | Annotations for server pods. | `{}` | | `hub.nodeAffinityPreset.values` | Node label values to match. Ignored if `hub.affinity` is set | `[]` |
| `hub.lifecycleHooks` | LifecycleHooks for the hub container to automate configuration before or after startup | `{}` | | `hub.affinity` | Affinity for pod assignment. | `{}` |
| `hub.customStartupProbe` | Override default startup probe | `{}` | | `hub.nodeSelector` | Node labels for pod assignment. | `{}` |
| `hub.customLivenessProbe` | Override default liveness probe | `{}` | | `hub.tolerations` | Tolerations for pod assignment. | `[]` |
| `hub.customReadinessProbe` | Override default readiness probe | `{}` | | `hub.topologySpreadConstraints` | Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template | `{}` |
| `hub.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` | | `hub.priorityClassName` | Priority Class Name | `""` |
| `hub.extraEnvVars` | Add extra environment variables to the Hub container | `[]` | | `hub.schedulerName` | Use an alternate scheduler, e.g. "stork". | `""` |
| `hub.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | | `hub.terminationGracePeriodSeconds` | Seconds Hub pod needs to terminate gracefully | `""` |
| `hub.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | | `hub.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` |
| `hub.extraVolumes` | Optionally specify extra list of additional volumes for Hub pods | `[]` | | `hub.updateStrategy.rollingUpdate` | Hub deployment rolling update configuration parameters | `{}` |
| `hub.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Hub container(s) | `[]` | | `hub.extraVolumes` | Optionally specify extra list of additional volumes for Hub pods | `[]` |
| `hub.initContainers` | Add additional init containers to the Hub pods | `[]` | | `hub.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Hub container(s) | `[]` |
| `hub.sidecars` | Add additional sidecar containers to the Hub pod | `[]` | | `hub.initContainers` | Add additional init containers to the Hub pods | `[]` |
| `hub.sidecars` | Add additional sidecar containers to the Hub pod | `[]` |
| `hub.pdb.create` | Deploy Hub PodDisruptionBudget | `false` |
| `hub.pdb.minAvailable` | Set minimum available hub instances | `""` |
| `hub.pdb.maxUnavailable` | Set maximum available hub instances | `""` |
### Hub RBAC parameters ### Hub RBAC parameters
| Name | Description | Value | | Name | Description | Value |
| --------------------------- | ---------------------------------------------------- | ------ | | ------------------------------------------------- | ---------------------------------------------------------------------- | ------ |
| `hub.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | | `hub.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
| `hub.serviceAccount.name` | Override Hub service account name | `""` | | `hub.serviceAccount.name` | Override Hub service account name | `""` |
| `hub.rbac.create` | Specifies whether RBAC resources should be created | `true` | | `hub.serviceAccount.automountServiceAccountToken` | Allows auto mount of ServiceAccountToken on the serviceAccount created | `true` |
| `hub.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` |
| `hub.rbac.create` | Specifies whether RBAC resources should be created | `true` |
| `hub.rbac.rules` | Custom RBAC rules to set | `[]` |
### Hub Traffic Exposure Parameters ### Hub Traffic Exposure Parameters
| Name | Description | Value | | Name | Description | Value |
| ----------------------------------------- | -------------------------------------------------------- | ----------- | | ----------------------------------------- | ---------------------------------------------------------------- | ----------- |
| `hub.networkPolicy.enabled` | Deploy Hub network policies | `true` | | `hub.networkPolicy.enabled` | Deploy Hub network policies | `true` |
| `hub.networkPolicy.allowInterspaceAccess` | Allow communication between pods in different namespaces | `true` | | `hub.networkPolicy.allowInterspaceAccess` | Allow communication between pods in different namespaces | `true` |
| `hub.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` | | `hub.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` |
| `hub.networkPolicy.extraEgress` | Add extra ingress rules to the NetworkPolicy | `""` | | `hub.networkPolicy.extraEgress` | Add extra ingress rules to the NetworkPolicy | `""` |
| `hub.service.type` | Hub service type | `ClusterIP` | | `hub.service.type` | Hub service type | `ClusterIP` |
| `hub.service.port` | Hub service HTTP port | `8081` | | `hub.service.ports.http` | Hub service HTTP port | `8081` |
| `hub.service.loadBalancerIP` | Hub service LoadBalancer IP (optional, cloud specific) | `""` | | `hub.service.nodePorts.http` | NodePort for the HTTP endpoint | `""` |
| `hub.service.loadBalancerSourceRanges` | loadBalancerIP source ranges for the Service | `[]` | | `hub.service.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` |
| `hub.service.nodePorts.http` | NodePort for the HTTP endpoint | `""` | | `hub.service.clusterIP` | Hub service Cluster IP | `""` |
| `hub.service.externalTrafficPolicy` | External traffic policy for the service | `Cluster` | | `hub.service.loadBalancerIP` | Hub service Load Balancer IP | `""` |
| `hub.service.loadBalancerSourceRanges` | Hub service Load Balancer sources | `[]` |
| `hub.service.externalTrafficPolicy` | Hub service external traffic policy | `Cluster` |
| `hub.service.annotations` | Additional custom annotations for Hub service | `{}` |
| `hub.service.extraPorts` | Extra port to expose on Hub service | `[]` |
### Hub Metrics parameters ### Hub Metrics parameters
| Name | Description | Value | | Name | Description | Value |
| --------------------------------------------- | ------------------------------------------------------------------------------------------- | -------------- | | ---------------------------------------------- | ------------------------------------------------------------------------------------------- | -------------- |
| `hub.metrics.authenticatePrometheus` | Use authentication for Prometheus | `false` | | `hub.metrics.authenticatePrometheus` | Use authentication for Prometheus | `false` |
| `hub.metrics.serviceMonitor.enabled` | If the operator is installed in your cluster, set to true to create a Service Monitor Entry | `false` | | `hub.metrics.serviceMonitor.enabled` | If the operator is installed in your cluster, set to true to create a Service Monitor Entry | `false` |
| `hub.metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `""` | | `hub.metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `""` |
| `hub.metrics.serviceMonitor.path` | HTTP path to scrape for metrics | `/hub/metrics` | | `hub.metrics.serviceMonitor.path` | HTTP path to scrape for metrics | `/hub/metrics` |
| `hub.metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` | | `hub.metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` |
| `hub.metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` | | `hub.metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` |
| `hub.metrics.serviceMonitor.relabellings` | Specify Metric Relabellings to add to the scrape endpoint | `[]` | | `hub.metrics.serviceMonitor.labels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` |
| `hub.metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `hub.metrics.serviceMonitor.selector` | Prometheus instance selector labels | `{}` |
| `hub.metrics.serviceMonitor.additionalLabels` | Used to pass Labels that are required by the installed Prometheus Operator | `{}` | | `hub.metrics.serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping | `[]` |
| `hub.metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion | `[]` |
| `hub.metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` |
| `hub.metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` |
### Proxy deployment parameters ### Proxy deployment parameters
| Name | Description | Value | | Name | Description | Value |
| --------------------------------------------- | ----------------------------------------------------------------------------------------- | --------------------------------- | | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | --------------------------------- |
| `proxy.image.registry` | Proxy image registry | `docker.io` | | `proxy.image.registry` | Proxy image registry | `docker.io` |
| `proxy.image.repository` | Proxy image repository | `bitnami/configurable-http-proxy` | | `proxy.image.repository` | Proxy image repository | `bitnami/configurable-http-proxy` |
| `proxy.image.tag` | Proxy image tag (immutable tags are recommended) | `4.5.1-debian-10-r7` | | `proxy.image.tag` | Proxy image tag (immutable tags are recommended) | `4.5.1-debian-10-r8` |
| `proxy.image.pullPolicy` | Proxy image pull policy | `IfNotPresent` | | `proxy.image.pullPolicy` | Proxy image pull policy | `IfNotPresent` |
| `proxy.image.pullSecrets` | Proxy image pull secrets | `[]` | | `proxy.image.pullSecrets` | Proxy image pull secrets | `[]` |
| `proxy.image.debug` | Activate verbose output | `false` | | `proxy.image.debug` | Activate verbose output | `false` |
| `proxy.startupProbe.enabled` | Enable startupProbe | `true` | | `proxy.secretToken` | Proxy secret token (used for communication with the Hub) | `""` |
| `proxy.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | | `proxy.command` | Override Proxy default command | `[]` |
| `proxy.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | | `proxy.args` | Override Proxy default args | `[]` |
| `proxy.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `3` | | `proxy.extraEnvVars` | Add extra environment variables to the Proxy container | `[]` |
| `proxy.startupProbe.failureThreshold` | Failure threshold for startupProbe | `30` | | `proxy.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` |
| `proxy.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | | `proxy.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` |
| `proxy.livenessProbe.enabled` | Enable livenessProbe | `true` | | `proxy.containerPort.api` | Proxy api container port | `8001` |
| `proxy.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | | `proxy.containerPort.metrics` | Proxy metrics container port | `8002` |
| `proxy.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | | `proxy.containerPort.http` | Proxy http container port | `8000` |
| `proxy.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `3` | | `proxy.startupProbe.enabled` | Enable startupProbe on Proxy containers | `true` |
| `proxy.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `30` | | `proxy.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` |
| `proxy.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | | `proxy.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` |
| `proxy.readinessProbe.enabled` | Enable readinessProbe | `true` | | `proxy.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `3` |
| `proxy.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` | | `proxy.startupProbe.failureThreshold` | Failure threshold for startupProbe | `30` |
| `proxy.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | | `proxy.startupProbe.successThreshold` | Success threshold for startupProbe | `1` |
| `proxy.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` | | `proxy.livenessProbe.enabled` | Enable livenessProbe on Proxy containers | `true` |
| `proxy.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `30` | | `proxy.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` |
| `proxy.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | | `proxy.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |
| `proxy.command` | Override Proxy default command | `[]` | | `proxy.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `3` |
| `proxy.args` | Override Proxy default args | `[]` | | `proxy.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `30` |
| `proxy.secretToken` | Proxy secret token (used for communication with the Hub) | `""` | | `proxy.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `proxy.hostAliases` | Add deployment host aliases | `[]` | | `proxy.readinessProbe.enabled` | Enable readinessProbe on Proxy containers | `true` |
| `proxy.pdb.create` | Deploy Proxy PodDisruptionBudget | `false` | | `proxy.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` |
| `proxy.pdb.minAvailable` | Set minimum available proxy instances | `""` | | `proxy.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` |
| `proxy.pdb.maxUnavailable` | Set maximum available proxy instances | `""` | | `proxy.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `3` |
| `proxy.containerPort.api` | Proxy api container port | `8001` | | `proxy.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `30` |
| `proxy.containerPort.metrics` | Proxy metrics container port | `8002` | | `proxy.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `proxy.containerPort.http` | Proxy http container port | `8000` | | `proxy.customStartupProbe` | Override default startup probe | `{}` |
| `proxy.priorityClassName` | Proxy pod priority class name | `""` | | `proxy.customLivenessProbe` | Override default liveness probe | `{}` |
| `proxy.resources.limits` | The resources limits for the container | `{}` | | `proxy.customReadinessProbe` | Override default readiness probe | `{}` |
| `proxy.resources.requests` | The requested resources for the container | `{}` | | `proxy.resources.limits` | The resources limits for the Proxy containers | `{}` |
| `proxy.containerSecurityContext.enabled` | Enabled Proxy containers' Security Context | `true` | | `proxy.resources.requests` | The requested resources for the Proxy containers | `{}` |
| `proxy.containerSecurityContext.runAsUser` | Set Proxy container's Security Context runAsUser | `1001` | | `proxy.containerSecurityContext.enabled` | Enabled Proxy containers' Security Context | `true` |
| `proxy.containerSecurityContext.runAsNonRoot` | Set Proxy container's Security Context runAsNonRoot | `true` | | `proxy.containerSecurityContext.runAsUser` | Set Proxy container's Security Context runAsUser | `1001` |
| `proxy.podSecurityContext.enabled` | Enabled Proxy pods' Security Context | `true` | | `proxy.containerSecurityContext.runAsNonRoot` | Set Proxy container's Security Context runAsNonRoot | `true` |
| `proxy.podSecurityContext.fsGroup` | Set Proxy pod's Security Context fsGroup | `1001` | | `proxy.podSecurityContext.enabled` | Enabled Proxy pods' Security Context | `true` |
| `proxy.podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `proxy.podSecurityContext.fsGroup` | Set Proxy pod's Security Context fsGroup | `1001` |
| `proxy.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | | `proxy.lifecycleHooks` | Add lifecycle hooks to the Proxy deployment | `{}` |
| `proxy.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `proxy.hostAliases` | Add deployment host aliases | `[]` |
| `proxy.nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set | `""` | | `proxy.podLabels` | Add extra labels to the Proxy pods | `{}` |
| `proxy.nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set | `[]` | | `proxy.podAnnotations` | Add extra annotations to the Proxy pods | `{}` |
| `proxy.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` | | `proxy.podAffinityPreset` | Pod affinity preset. Ignored if `proxy.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `proxy.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` | | `proxy.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `proxy.affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `proxy.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` | | `proxy.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `proxy.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `proxy.podLabels` | Extra labels for Proxy pods | `{}` | | `proxy.nodeAffinityPreset.key` | Node label key to match. Ignored if `proxy.affinity` is set | `""` |
| `proxy.podAnnotations` | Annotations for Proxy pods | `{}` | | `proxy.nodeAffinityPreset.values` | Node label values to match. Ignored if `proxy.affinity` is set | `[]` |
| `proxy.lifecycleHooks` | Add lifecycle hooks to the Proxy deployment | `{}` | | `proxy.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` |
| `proxy.customStartupProbe` | Override default startup probe | `{}` | | `proxy.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `proxy.customLivenessProbe` | Override default liveness probe | `{}` | | `proxy.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `proxy.customReadinessProbe` | Override default readiness probe | `{}` | | `proxy.topologySpreadConstraints` | Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template | `{}` |
| `proxy.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` | | `proxy.priorityClassName` | Priority Class Name | `""` |
| `proxy.extraEnvVars` | Add extra environment variables to the Proxy container | `[]` | | `proxy.schedulerName` | Use an alternate scheduler, e.g. "stork". | `""` |
| `proxy.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | | `proxy.terminationGracePeriodSeconds` | Seconds Proxy pod needs to terminate gracefully | `""` |
| `proxy.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | | `proxy.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` |
| `proxy.extraVolumes` | Optionally specify extra list of additional volumes for Proxy pods | `[]` | | `proxy.updateStrategy.rollingUpdate` | Proxy deployment rolling update configuration parameters | `{}` |
| `proxy.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Proxy container(s) | `[]` | | `proxy.extraVolumes` | Optionally specify extra list of additional volumes for Proxy pods | `[]` |
| `proxy.initContainers` | Add additional init containers to the Proxy pods | `[]` | | `proxy.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Proxy container(s) | `[]` |
| `proxy.sidecars` | Add additional sidecar containers to the Proxy pod | `[]` | | `proxy.initContainers` | Add additional init containers to the Proxy pods | `[]` |
| `proxy.sidecars` | Add additional sidecar containers to the Proxy pod | `[]` |
| `proxy.pdb.create` | Deploy Proxy PodDisruptionBudget | `false` |
| `proxy.pdb.minAvailable` | Set minimum available proxy instances | `""` |
| `proxy.pdb.maxUnavailable` | Set maximum available proxy instances | `""` |
### Proxy Traffic Exposure Parameters ### Proxy Traffic Exposure Parameters
@@ -261,88 +290,110 @@ The command removes all the Kubernetes components associated with the chart and
| `proxy.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` | | `proxy.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` |
| `proxy.networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `""` | | `proxy.networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `""` |
| `proxy.service.api.type` | API service type | `ClusterIP` | | `proxy.service.api.type` | API service type | `ClusterIP` |
| `proxy.service.api.port` | API service port | `8001` | | `proxy.service.api.ports.http` | API service HTTP port | `8001` |
| `proxy.service.api.loadBalancerIP` | API service LoadBalancer IP (optional, cloud specific) | `""` |
| `proxy.service.api.loadBalancerSourceRanges` | loadBalancerIP source ranges for the Service | `[]` |
| `proxy.service.api.nodePorts.http` | NodePort for the HTTP endpoint | `""` | | `proxy.service.api.nodePorts.http` | NodePort for the HTTP endpoint | `""` |
| `proxy.service.api.externalTrafficPolicy` | External traffic policy for the service | `Cluster` | | `proxy.service.api.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` |
| `proxy.service.api.clusterIP` | Hub service Cluster IP | `""` |
| `proxy.service.api.loadBalancerIP` | Hub service Load Balancer IP | `""` |
| `proxy.service.api.loadBalancerSourceRanges` | Hub service Load Balancer sources | `[]` |
| `proxy.service.api.externalTrafficPolicy` | Hub service external traffic policy | `Cluster` |
| `proxy.service.api.annotations` | Additional custom annotations for Hub service | `{}` |
| `proxy.service.api.extraPorts` | Extra port to expose on Hub service | `[]` |
| `proxy.service.metrics.type` | Metrics service type | `ClusterIP` | | `proxy.service.metrics.type` | Metrics service type | `ClusterIP` |
| `proxy.service.metrics.port` | Metrics service port | `8002` | | `proxy.service.metrics.ports.http` | Metrics service port | `8002` |
| `proxy.service.metrics.loadBalancerIP` | Metrics service LoadBalancer IP (optional, cloud specific) | `""` |
| `proxy.service.metrics.loadBalancerSourceRanges` | loadBalancerIP source ranges for the Service | `[]` |
| `proxy.service.metrics.nodePorts.http` | NodePort for the HTTP endpoint | `""` | | `proxy.service.metrics.nodePorts.http` | NodePort for the HTTP endpoint | `""` |
| `proxy.service.metrics.externalTrafficPolicy` | External traffic policy for the service | `Cluster` | | `proxy.service.metrics.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` |
| `proxy.service.metrics.clusterIP` | Hub service Cluster IP | `""` |
| `proxy.service.metrics.loadBalancerIP` | Hub service Load Balancer IP | `""` |
| `proxy.service.metrics.loadBalancerSourceRanges` | Hub service Load Balancer sources | `[]` |
| `proxy.service.metrics.externalTrafficPolicy` | Hub service external traffic policy | `Cluster` |
| `proxy.service.metrics.annotations` | Additional custom annotations for Hub service | `{}` |
| `proxy.service.metrics.extraPorts` | Extra port to expose on Hub service | `[]` |
| `proxy.service.public.type` | Public service type | `LoadBalancer` | | `proxy.service.public.type` | Public service type | `LoadBalancer` |
| `proxy.service.public.port` | Public service port | `80` | | `proxy.service.public.ports.http` | Public service HTTP port | `80` |
| `proxy.service.public.loadBalancerIP` | Public service LoadBalancer IP (optional, cloud specific) | `""` |
| `proxy.service.public.loadBalancerSourceRanges` | loadBalancerIP source ranges for the Service | `[]` |
| `proxy.service.public.nodePorts.http` | NodePort for the HTTP endpoint | `""` | | `proxy.service.public.nodePorts.http` | NodePort for the HTTP endpoint | `""` |
| `proxy.service.public.externalTrafficPolicy` | External traffic policy for the service | `Cluster` | | `proxy.service.public.sessionAffinity` | Control where client requests go, to the same pod or round-robin | `None` |
| `proxy.service.public.clusterIP` | Hub service Cluster IP | `""` |
| `proxy.service.public.loadBalancerIP` | Hub service Load Balancer IP | `""` |
| `proxy.service.public.loadBalancerSourceRanges` | Hub service Load Balancer sources | `[]` |
| `proxy.service.public.externalTrafficPolicy` | Hub service external traffic policy | `Cluster` |
| `proxy.service.public.annotations` | Additional custom annotations for Hub service | `{}` |
| `proxy.service.public.extraPorts` | Extra port to expose on Hub service | `[]` |
| `proxy.ingress.enabled` | Set to true to enable ingress record generation | `false` | | `proxy.ingress.enabled` | Set to true to enable ingress record generation | `false` |
| `proxy.ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` | | `proxy.ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` |
| `proxy.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | | `proxy.ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` |
| `proxy.ingress.path` | Path to the Proxy pod. | `/` |
| `proxy.ingress.pathType` | Ingress path type | `ImplementationSpecific` | | `proxy.ingress.pathType` | Ingress path type | `ImplementationSpecific` |
| `proxy.ingress.hostname` | Set ingress rule hostname | `jupyterhub.local` | | `proxy.ingress.hostname` | Set ingress rule hostname | `jupyterhub.local` |
| `proxy.ingress.path` | Path to the Proxy pod | `/` |
| `proxy.ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | | `proxy.ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` |
| `proxy.ingress.tls` | Enable ingress tls configuration for the hostname defined at proxy.ingress.hostname | `false` | | `proxy.ingress.tls` | Enable TLS configuration for the host defined at `ingress.hostname` parameter | `false` |
| `proxy.ingress.selfSigned` | Create a TLS secret for this ingress record using self-signed certificates generated by Helm | `false` | | `proxy.ingress.selfSigned` | Create a TLS secret for this ingress record using self-signed certificates generated by Helm | `false` |
| `proxy.ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` | | `proxy.ingress.extraHosts` | An array with additional hostname(s) to be covered with the ingress record | `[]` |
| `proxy.ingress.extraPaths` | An array with additional arbitrary paths that may need to be added to the ingress under the main host | `[]` |
| `proxy.ingress.extraTls` | The tls configuration for additional hostnames to be covered with this ingress record. | `[]` | | `proxy.ingress.extraTls` | The tls configuration for additional hostnames to be covered with this ingress record. | `[]` |
| `proxy.ingress.extraPaths` | Any additional arbitrary paths that may need to be added to the ingress under the main host. | `[]` | | `proxy.ingress.secrets` | Custom TLS certificates as secrets | `[]` |
| `proxy.ingress.secrets` | Add extra secrets for the tls configuration | `[]` |
### Proxy Metrics parameters ### Proxy Metrics parameters
| Name | Description | Value | | Name | Description | Value |
| ----------------------------------------------- | ------------------------------------------------------------------------------------------- | ---------- | | ------------------------------------------------ | ------------------------------------------------------------------------------------------- | ---------- |
| `proxy.metrics.serviceMonitor.enabled` | If the operator is installed in your cluster, set to true to create a Service Monitor Entry | `false` | | `proxy.metrics.serviceMonitor.enabled` | If the operator is installed in your cluster, set to true to create a Service Monitor Entry | `false` |
| `proxy.metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `""` | | `proxy.metrics.serviceMonitor.namespace` | Namespace which Prometheus is running in | `""` |
| `proxy.metrics.serviceMonitor.path` | HTTP path to scrape for metrics | `/metrics` | | `proxy.metrics.serviceMonitor.path` | HTTP path to scrape for metrics | `/metrics` |
| `proxy.metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` | | `proxy.metrics.serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` |
| `proxy.metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` | | `proxy.metrics.serviceMonitor.scrapeTimeout` | Specify the timeout after which the scrape is ended | `""` |
| `proxy.metrics.serviceMonitor.relabellings` | Specify Metric Relabellings to add to the scrape endpoint | `[]` | | `proxy.metrics.serviceMonitor.labels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` |
| `proxy.metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` | | `proxy.metrics.serviceMonitor.selector` | Prometheus instance selector labels | `{}` |
| `proxy.metrics.serviceMonitor.additionalLabels` | Used to pass Labels that are required by the installed Prometheus Operator | `{}` | | `proxy.metrics.serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping | `[]` |
| `proxy.metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion | `[]` |
| `proxy.metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` |
| `proxy.metrics.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `""` |
### Image puller deployment parameters ### Image puller deployment parameters
| Name | Description | Value | | Name | Description | Value |
| --------------------------------------------------- | ----------------------------------------------------------------------------------------- | --------------- | | --------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------ | --------------- |
| `imagePuller.enabled` | Deploy ImagePuller daemonset | `true` | | `imagePuller.enabled` | Deploy ImagePuller daemonset | `true` |
| `imagePuller.command` | Override ImagePuller default command | `[]` | | `imagePuller.command` | Override ImagePuller default command | `[]` |
| `imagePuller.args` | Override ImagePuller default args | `[]` | | `imagePuller.args` | Override ImagePuller default args | `[]` |
| `imagePuller.hostAliases` | Add deployment host aliases | `[]` | | `imagePuller.extraEnvVars` | Add extra environment variables to the ImagePuller container | `[]` |
| `imagePuller.resources.limits` | The resources limits for the container | `{}` | | `imagePuller.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` |
| `imagePuller.resources.requests` | The requested resources for the container | `{}` | | `imagePuller.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` |
| `imagePuller.containerSecurityContext.enabled` | Enabled ImagePuller containers' Security Context | `true` | | `imagePuller.customStartupProbe` | Override default startup probe | `{}` |
| `imagePuller.containerSecurityContext.runAsUser` | Set ImagePuller container's Security Context runAsUser | `1001` | | `imagePuller.customLivenessProbe` | Override default liveness probe | `{}` |
| `imagePuller.containerSecurityContext.runAsNonRoot` | Set ImagePuller container's Security Context runAsNonRoot | `true` | | `imagePuller.customReadinessProbe` | Override default readiness probe | `{}` |
| `imagePuller.podSecurityContext.enabled` | Enabled ImagePuller pods' Security Context | `true` | | `imagePuller.resources.limits` | The resources limits for the ImagePuller containers | `{}` |
| `imagePuller.podSecurityContext.fsGroup` | Set ImagePuller pod's Security Context fsGroup | `1001` | | `imagePuller.resources.requests` | The requested resources for the ImagePuller containers | `{}` |
| `imagePuller.podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `imagePuller.containerSecurityContext.enabled` | Enabled ImagePuller containers' Security Context | `true` |
| `imagePuller.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | | `imagePuller.containerSecurityContext.runAsUser` | Set ImagePuller container's Security Context runAsUser | `1001` |
| `imagePuller.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | | `imagePuller.containerSecurityContext.runAsNonRoot` | Set ImagePuller container's Security Context runAsNonRoot | `true` |
| `imagePuller.nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set | `""` | | `imagePuller.podSecurityContext.enabled` | Enabled ImagePuller pods' Security Context | `true` |
| `imagePuller.nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set | `[]` | | `imagePuller.podSecurityContext.fsGroup` | Set ImagePuller pod's Security Context fsGroup | `1001` |
| `imagePuller.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` | | `imagePuller.lifecycleHooks` | Add lifecycle hooks to the ImagePuller deployment | `{}` |
| `imagePuller.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` | | `imagePuller.hostAliases` | Add deployment host aliases | `[]` |
| `imagePuller.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` | | `imagePuller.podLabels` | Pod extra labels | `{}` |
| `imagePuller.podLabels` | Pod extra labels | `{}` | | `imagePuller.podAnnotations` | Annotations for ImagePuller pods | `{}` |
| `imagePuller.podAnnotations` | Annotations for ImagePuller pods | `{}` | | `imagePuller.podAffinityPreset` | Pod affinity preset. Ignored if `imagePuller.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `imagePuller.priorityClassName` | ImagePuller pod priority class name | `""` | | `imagePuller.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `imagePuller.affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `imagePuller.lifecycleHooks` | Add lifecycle hooks to the ImagePuller deployment | `{}` | | `imagePuller.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `imagePuller.affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `imagePuller.customStartupProbe` | Override default startup probe | `{}` | | `imagePuller.nodeAffinityPreset.key` | Node label key to match. Ignored if `imagePuller.affinity` is set | `""` |
| `imagePuller.customLivenessProbe` | Override default liveness probe | `{}` | | `imagePuller.nodeAffinityPreset.values` | Node label values to match. Ignored if `imagePuller.affinity` is set | `[]` |
| `imagePuller.customReadinessProbe` | Override default readiness probe | `{}` | | `imagePuller.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` |
| `imagePuller.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` | | `imagePuller.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `imagePuller.extraEnvVars` | Add extra environment variables to the ImagePuller container | `[]` | | `imagePuller.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `imagePuller.extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | | `imagePuller.topologySpreadConstraints` | Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template | `{}` |
| `imagePuller.extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | | `imagePuller.priorityClassName` | Priority Class Name | `""` |
| `imagePuller.extraVolumes` | Optionally specify extra list of additional volumes for ImagePuller pods | `[]` | | `imagePuller.schedulerName` | Use an alternate scheduler, e.g. "stork". | `""` |
| `imagePuller.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for ImagePuller container(s) | `[]` | | `imagePuller.terminationGracePeriodSeconds` | Seconds ImagePuller pod needs to terminate gracefully | `""` |
| `imagePuller.initContainers` | Add additional init containers to the ImagePuller pods | `[]` | | `imagePuller.updateStrategy.type` | Update strategy - only really applicable for deployments with RWO PVs attached | `RollingUpdate` |
| `imagePuller.sidecars` | Add additional sidecar containers to the ImagePuller pod | `[]` | | `imagePuller.updateStrategy.rollingUpdate` | ImagePuller deployment rolling update configuration parameters | `{}` |
| `imagePuller.extraVolumes` | Optionally specify extra list of additional volumes for ImagePuller pods | `[]` |
| `imagePuller.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for ImagePuller container(s) | `[]` |
| `imagePuller.initContainers` | Add additional init containers to the ImagePuller pods | `[]` |
| `imagePuller.sidecars` | Add additional sidecar containers to the ImagePuller pod | `[]` |
### Singleuser deployment parameters ### Singleuser deployment parameters
@@ -350,36 +401,40 @@ The command removes all the Kubernetes components associated with the chart and
| ----------------------------------------------- | --------------------------------------------------------------------------------------------------- | ------------------------------------ | | ----------------------------------------------- | --------------------------------------------------------------------------------------------------- | ------------------------------------ |
| `singleuser.image.registry` | Single User image registry | `docker.io` | | `singleuser.image.registry` | Single User image registry | `docker.io` |
| `singleuser.image.repository` | Single User image repository | `bitnami/jupyter-base-notebook` | | `singleuser.image.repository` | Single User image repository | `bitnami/jupyter-base-notebook` |
| `singleuser.image.tag` | Single User image tag (immutabe tags are recommended) | `1.5.0-debian-10-r104` | | `singleuser.image.tag` | Single User image tag (immutabe tags are recommended) | `1.5.0-debian-10-r106` |
| `singleuser.image.pullPolicy` | Single User image pull policy | `IfNotPresent` | | `singleuser.image.pullPolicy` | Single User image pull policy | `IfNotPresent` |
| `singleuser.image.pullSecrets` | Single User image pull secrets | `[]` | | `singleuser.image.pullSecrets` | Single User image pull secrets | `[]` |
| `singleuser.command` | Override Single User default command | `[]` |
| `singleuser.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `singleuser.containerPort` | Single User container port | `8888` |
| `singleuser.notebookDir` | Notebook directory (it will be the same as the PVC volume mount) | `/opt/bitnami/jupyterhub-singleuser` | | `singleuser.notebookDir` | Notebook directory (it will be the same as the PVC volume mount) | `/opt/bitnami/jupyterhub-singleuser` |
| `singleuser.resources.limits` | The resources limits for the container | `{}` | | `singleuser.command` | Override Single User default command | `[]` |
| `singleuser.resources.requests` | The requested resources for the container | `{}` | | `singleuser.extraEnvVars` | Add extra environment variables to the Single User container | `[]` |
| `singleuser.containerPort` | Single User container port | `8888` |
| `singleuser.resources.limits` | The resources limits for the Singleuser containers | `{}` |
| `singleuser.resources.requests` | The requested resources for the Singleuser containers | `{}` |
| `singleuser.containerSecurityContext.enabled` | Enabled Single User containers' Security Context | `true` | | `singleuser.containerSecurityContext.enabled` | Enabled Single User containers' Security Context | `true` |
| `singleuser.containerSecurityContext.runAsUser` | Set Single User container's Security Context runAsUser | `1001` | | `singleuser.containerSecurityContext.runAsUser` | Set Single User container's Security Context runAsUser | `1001` |
| `singleuser.podSecurityContext.enabled` | Enabled Single User pods' Security Context | `true` | | `singleuser.podSecurityContext.enabled` | Enabled Single User pods' Security Context | `true` |
| `singleuser.podSecurityContext.fsGroup` | Set Single User pod's Security Context fsGroup | `1001` | | `singleuser.podSecurityContext.fsGroup` | Set Single User pod's Security Context fsGroup | `1001` |
| `singleuser.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `singleuser.podLabels` | Extra labels for Single User pods | `{}` | | `singleuser.podLabels` | Extra labels for Single User pods | `{}` |
| `singleuser.podAnnotations` | Annotations for Single User pods | `{}` | | `singleuser.podAnnotations` | Annotations for Single User pods | `{}` |
| `singleuser.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `singleuser.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `singleuser.priorityClassName` | Single User pod priority class name | `""` | | `singleuser.priorityClassName` | Single User pod priority class name | `""` |
| `singleuser.lifecycleHooks` | Add lifecycle hooks to the Single User deployment to automate configuration before or after startup | `{}` | | `singleuser.lifecycleHooks` | Add lifecycle hooks to the Single User deployment to automate configuration before or after startup | `{}` |
| `singleuser.extraEnvVars` | Add extra environment variables to the Single User container | `[]` |
| `singleuser.extraVolumes` | Optionally specify extra list of additional volumes for Single User pods | `[]` | | `singleuser.extraVolumes` | Optionally specify extra list of additional volumes for Single User pods | `[]` |
| `singleuser.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Single User container(s) | `[]` | | `singleuser.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Single User container(s) | `[]` |
| `singleuser.initContainers` | Add additional init containers to the Single User pods | `[]` | | `singleuser.initContainers` | Add additional init containers to the Single User pods | `[]` |
| `singleuser.sidecars` | Add additional sidecar containers to the Single User pod | `[]` | | `singleuser.sidecars` | Add additional sidecar containers to the Single User pod | `[]` |
### Single User RBAC parameters ### Single User RBAC parameters
| Name | Description | Value | | Name | Description | Value |
| ---------------------------------- | ---------------------------------------------------- | ------ | | -------------------------------------------------------- | ---------------------------------------------------------------------- | ------ |
| `singleuser.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` | | `singleuser.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
| `singleuser.serviceAccount.name` | Override Single User service account name | `""` | | `singleuser.serviceAccount.name` | Override Single User service account name | `""` |
| `singleuser.serviceAccount.automountServiceAccountToken` | Allows auto mount of ServiceAccountToken on the serviceAccount created | `true` |
| `singleuser.serviceAccount.annotations` | Additional custom annotations for the ServiceAccount | `{}` |
### Single User Persistence parameters ### Single User Persistence parameters
@@ -390,6 +445,7 @@ The command removes all the Kubernetes components associated with the chart and
| `singleuser.persistence.accessModes` | Persistent Volumes access modes | `["ReadWriteOnce"]` | | `singleuser.persistence.accessModes` | Persistent Volumes access modes | `["ReadWriteOnce"]` |
| `singleuser.persistence.size` | Persistent Volumes size | `10Gi` | | `singleuser.persistence.size` | Persistent Volumes size | `10Gi` |
### Traffic exposure parameters ### Traffic exposure parameters
| Name | Description | Value | | Name | Description | Value |
@@ -400,43 +456,37 @@ The command removes all the Kubernetes components associated with the chart and
| `singleuser.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` | | `singleuser.networkPolicy.extraIngress` | Add extra ingress rules to the NetworkPolicy | `""` |
| `singleuser.networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `""` | | `singleuser.networkPolicy.extraEgress` | Add extra egress rules to the NetworkPolicy | `""` |
### Auxiliary image parameters ### Auxiliary image parameters
| Name | Description | Value | | Name | Description | Value |
| ---------------------------- | --------------------------------------------------- | ----------------------- | | ---------------------------- | --------------------------------------------------- | ----------------------- |
| `auxiliaryImage.registry` | Auxiliary image registry | `docker.io` | | `auxiliaryImage.registry` | Auxiliary image registry | `docker.io` |
| `auxiliaryImage.repository` | Auxiliary image repository | `bitnami/bitnami-shell` | | `auxiliaryImage.repository` | Auxiliary image repository | `bitnami/bitnami-shell` |
| `auxiliaryImage.tag` | Auxiliary image tag (immutabe tags are recommended) | `10-debian-10-r351` | | `auxiliaryImage.tag` | Auxiliary image tag (immutabe tags are recommended) | `10-debian-10-r353` |
| `auxiliaryImage.pullPolicy` | Auxiliary image pull policy | `IfNotPresent` | | `auxiliaryImage.pullPolicy` | Auxiliary image pull policy | `IfNotPresent` |
| `auxiliaryImage.pullSecrets` | Auxiliary image pull secrets | `[]` | | `auxiliaryImage.pullSecrets` | Auxiliary image pull secrets | `[]` |
### External Database settings
| Name | Description | Value | ### JupyterHub database parameters
| --------------------------------- | --------------------------------------------------------------------------------------------------------------- | ------------ |
| `externalDatabase.host` | Host of an external PostgreSQL instance to connect (only if postgresql.enabled=false) | `""` |
| `externalDatabase.user` | User of an external PostgreSQL instance to connect (only if postgresql.enabled=false) | `postgres` |
| `externalDatabase.password` | Password of an external PostgreSQL instance to connect (only if postgresql.enabled=false) | `""` |
| `externalDatabase.existingSecret` | Secret containing the password of an external PostgreSQL instance to connect (only if postgresql.enabled=false) | `""` |
| `externalDatabase.database` | Database inside an external PostgreSQL to connect (only if postgresql.enabled=false) | `jupyterhub` |
| `externalDatabase.port` | Port of an external PostgreSQL to connect (only if postgresql.enabled=false) | `5432` |
### PostgreSQL subchart settings | Name | Description | Value |
| -------------------------------------------- | ----------------------------------------------------------------------- | -------------------- |
| `postgresql.enabled` | Switch to enable or disable the PostgreSQL helm chart | `true` |
| `postgresql.auth.username` | Name for a custom user to create | `bn_jupyterhub` |
| `postgresql.auth.password` | Password for the custom user to create | `""` |
| `postgresql.auth.database` | Name for a custom database to create | `bitnami_jupyterhub` |
| `postgresql.auth.existingSecret` | Name of existing secret to use for PostgreSQL credentials | `""` |
| `postgresql.architecture` | PostgreSQL architecture (`standalone` or `replication`) | `standalone` |
| `postgresql.service.ports.postgresql` | PostgreSQL service port | `5432` |
| `externalDatabase.host` | Database host | `""` |
| `externalDatabase.port` | Database port number | `5432` |
| `externalDatabase.user` | Non-root username for JupyterHub | `postgres` |
| `externalDatabase.password` | Password for the non-root username for JupyterHub | `""` |
| `externalDatabase.database` | JupyterHub database name | `jupyterhub` |
| `externalDatabase.existingSecret` | Name of an existing secret resource containing the database credentials | `""` |
| `externalDatabase.existingSecretPasswordKey` | Name of an existing secret key containing the database credentials | `""` |
| Name | Description | Value |
| -------------------------------------- | ---------------------------------------------------------------------------------- | -------------------- |
| `postgresql.enabled` | Deploy PostgreSQL subchart | `true` |
| `postgresql.nameOverride` | Override name of the PostgreSQL chart | `""` |
| `postgresql.existingSecret` | Existing secret containing the password of the PostgreSQL chart | `""` |
| `postgresql.auth.password` | Password for the postgres user of the PostgreSQL chart (auto-generated if not set) | `""` |
| `postgresql.auth.username` | Username to create when deploying the PostgreSQL chart | `bn_jupyterhub` |
| `postgresql.auth.database` | Database to create when deploying the PostgreSQL chart | `bitnami_jupyterhub` |
| `postgresql.service.ports.postgresql` | PostgreSQL service port | `5432` |
| `postgresql.persistence.enabled` | Use PVCs when deploying the PostgreSQL chart | `true` |
| `postgresql.persistence.existingClaim` | Use an existing PVC when deploying the PostgreSQL chart | `""` |
| `postgresql.persistence.storageClass` | storageClass of the created PVCs | `""` |
| `postgresql.persistence.accessMode` | Access mode of the created PVCs | `ReadWriteOnce` |
| `postgresql.persistence.size` | Size of the created PVCs | `8Gi` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
@@ -536,4 +586,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

6
bitnami/jupyterhub/templates/NOTES.txt
View File

@@ -17,6 +17,7 @@ APP VERSION: {{ .Chart.AppVersion }}
1. Get the JupyterHub URL by running: 1. Get the JupyterHub URL by running:
{{- $port := coalesce .Values.proxy.service.public.ports.http .Values.proxy.service.public.port | toString }}
{{- if eq .Values.proxy.service.public.type "NodePort" }} {{- if eq .Values.proxy.service.public.type "NodePort" }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}-proxy-public) export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "common.names.fullname" . }}-proxy-public)
@@ -29,13 +30,12 @@ APP VERSION: {{ .Chart.AppVersion }}
** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}-proxy-public ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "common.names.fullname" . }}-proxy-public **
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }}-proxy-public --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }}-proxy-public --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
echo "JupyterHub URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ $port }}{{ end }}/"
{{- $port:=.Values.proxy.service.public.port | toString }}
echo "JupyterHub URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.proxy.service.public.port }}{{ end }}/"
{{- else if eq .Values.proxy.service.public.type "ClusterIP" }} {{- else if eq .Values.proxy.service.public.type "ClusterIP" }}
echo "JupyterHub URL: http://127.0.0.1:8080/" echo "JupyterHub URL: http://127.0.0.1:8080/"
kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }}-proxy-public 8080:{{ .Values.proxy.service.public.port }} kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }}-proxy-public 8080:{{ $port }}
{{- end }} {{- end }}
{{- end }} {{- end }}

19
bitnami/jupyterhub/templates/_helpers.tpl
View File

@@ -168,6 +168,25 @@ Get the Postgresql credentials secret.
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{/*
Add environment variables to configure database values
*/}}
{{- define "jupyterhub.databaseSecretKey" -}}
{{- if .Values.postgresql.enabled -}}
{{- print "password" -}}
{{- else -}}
{{- if .Values.externalDatabase.existingSecret -}}
{{- if .Values.externalDatabase.existingSecretPasswordKey -}}
{{- printf "%s" .Values.externalDatabase.existingSecretPasswordKey -}}
{{- else -}}
{{- print "db-password" -}}
{{- end -}}
{{- else -}}
{{- print "db-password" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/* {{/*
Get the Postgresql credentials secret. Get the Postgresql credentials secret.
*/}} */}}

2
bitnami/jupyterhub/templates/hub/configmap.yaml
View File

@@ -101,7 +101,7 @@ data:
# hub_bind_url configures what the JupyterHub process within the hub pod's # hub_bind_url configures what the JupyterHub process within the hub pod's
# container should listen to. # container should listen to.
hub_container_port = {{ .Values.hub.containerPort }} hub_container_port = {{ coalesce .Values.hub.containerPorts.http .Values.hub.containerPort }}
c.JupyterHub.hub_bind_url = f"http://:{hub_container_port}" c.JupyterHub.hub_bind_url = f"http://:{hub_container_port}"
# hub_connect_url is the URL for connecting to the hub for use by external # hub_connect_url is the URL for connecting to the hub for use by external

54
bitnami/jupyterhub/templates/hub/deployment.yaml
View File

@@ -1,13 +1,13 @@
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
@@ -58,12 +58,21 @@ spec:
{{- if .Values.hub.tolerations }} {{- if .Values.hub.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.hub.tolerations "context" .) | nindent 8 }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.hub.tolerations "context" .) | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.hub.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.hub.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.hub.priorityClassName }} {{- if .Values.hub.priorityClassName }}
priorityClassName: {{ .Values.hub.priorityClassName | quote }} priorityClassName: {{ .Values.hub.priorityClassName | quote }}
{{- end }} {{- end }}
{{- if .Values.hub.schedulerName }}
schedulerName: {{ .Values.hub.schedulerName }}
{{- end }}
{{- if .Values.hub.podSecurityContext.enabled }} {{- if .Values.hub.podSecurityContext.enabled }}
securityContext: {{- omit .Values.hub.podSecurityContext "enabled" | toYaml | nindent 8 }} securityContext: {{- omit .Values.hub.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.hub.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.hub.terminationGracePeriodSeconds }}
{{- end }}
initContainers: initContainers:
{{- if .Values.postgresql.enabled }} {{- if .Values.postgresql.enabled }}
# NOTE: The value postgresql.image is not available unless postgresql.enabled is not set. We could change this to use bitnami-shell if # NOTE: The value postgresql.image is not available unless postgresql.enabled is not set. We could change this to use bitnami-shell if
@@ -112,7 +121,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "jupyterhub.databaseSecretName" . }} name: {{ include "jupyterhub.databaseSecretName" . }}
key: "password" key: {{ include "jupyterhub.databaseSecretKey" . }}
- name: POSTGRESQL_CLIENT_POSTGRES_USER - name: POSTGRESQL_CLIENT_POSTGRES_USER
value: {{ ternary .Values.postgresql.auth.username .Values.externalDatabase.host .Values.postgresql.enabled | quote }} value: {{ ternary .Values.postgresql.auth.username .Values.externalDatabase.host .Values.postgresql.enabled | quote }}
{{- end }} {{- end }}
@@ -129,13 +138,17 @@ spec:
{{- if .Values.hub.containerSecurityContext.enabled }} {{- if .Values.hub.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.hub.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.hub.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.hub.command }} {{- if .Values.diagnosticMode.enabled }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
{{- else if .Values.hub.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.hub.command "context" $) | nindent 12 }} command: {{- include "common.tplvalues.render" (dict "value" .Values.hub.command "context" $) | nindent 12 }}
{{- else }} {{- else }}
command: command:
- jupyterhub - jupyterhub
{{- end }} {{- end }}
{{- if .Values.hub.args }} {{- if .Values.diagnosticMode.enabled }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
{{- else if .Values.hub.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.hub.args "context" $) | nindent 12 }} args: {{- include "common.tplvalues.render" (dict "value" .Values.hub.args "context" $) | nindent 12 }}
{{- else }} {{- else }}
args: args:
@@ -148,16 +161,16 @@ spec:
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
containerPort: {{ .Values.hub.containerPort }} containerPort: {{ coalesce .Values.hub.containerPorts.http .Values.hub.containerPort }}
env: env:
- name: PYTHONUNBUFFERED - name: PYTHONUNBUFFERED
value: "1" value: "1"
- name: HELM_RELEASE_NAME - name: HELM_RELEASE_NAME
value: {{ .Release.Name | quote }} value: {{ .Release.Name | quote }}
- name: PROXY_API_SERVICE_PORT - name: PROXY_API_SERVICE_PORT
value: {{ .Values.proxy.service.api.port | quote }} value: {{ coalesce .Values.proxy.service.api.ports.http .Values.proxy.service.api.port | quote }}
- name: HUB_SERVICE_PORT - name: HUB_SERVICE_PORT
value: {{ .Values.hub.service.port | quote }} value: {{ coalesce .Values.hub.service.ports.http .Values.hub.service.port | quote }}
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
fieldRef: fieldRef:
@@ -171,7 +184,7 @@ spec:
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ include "jupyterhub.databaseSecretName" . }} name: {{ include "jupyterhub.databaseSecretName" . }}
key: {{ ternary "password" "db-password" .Values.postgresql.enabled | quote }} key: {{ include "jupyterhub.databaseSecretKey" . }}
{{- if .Values.hub.extraEnvVars }} {{- if .Values.hub.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.hub.extraEnvVars "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.hub.extraEnvVars "context" $) | nindent 12 }}
{{- end }} {{- end }}
@@ -187,45 +200,32 @@ spec:
{{- if .Values.hub.resources }} {{- if .Values.hub.resources }}
resources: {{- toYaml .Values.hub.resources | nindent 12 }} resources: {{- toYaml .Values.hub.resources | nindent 12 }}
{{- end }} {{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.hub.startupProbe.enabled }} {{- if .Values.hub.startupProbe.enabled }}
startupProbe: startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.hub.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health
port: http port: http
initialDelaySeconds: {{ .Values.hub.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.hub.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.hub.startupProbe.timeoutSeconds }}
failureThreshold: {{ .Values.hub.startupProbe.failureThreshold }}
successThreshold: {{ .Values.hub.startupProbe.successThreshold }}
{{- else if .Values.hub.customStartupProbe }} {{- else if .Values.hub.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customStartupProbe "context" $) | nindent 12 }} startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customStartupProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.hub.livenessProbe.enabled }} {{- if .Values.hub.livenessProbe.enabled }}
livenessProbe: livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.hub.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health
port: http port: http
initialDelaySeconds: {{ .Values.hub.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.hub.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.hub.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.hub.livenessProbe.failureThreshold }}
successThreshold: {{ .Values.hub.livenessProbe.successThreshold }}
{{- else if .Values.hub.customLivenessProbe }} {{- else if .Values.hub.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customLivenessProbe "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.hub.readinessProbe.enabled }} {{- if .Values.hub.readinessProbe.enabled }}
readinessProbe: readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.hub.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health path: {{ .Values.hub.baseUrl | trimSuffix "/" }}/hub/health
port: http port: http
initialDelaySeconds: {{ .Values.hub.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.hub.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.hub.readinessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.hub.readinessProbe.failureThreshold }}
successThreshold: {{ .Values.hub.readinessProbe.successThreshold }}
{{- else if .Values.hub.customReadinessProbe }} {{- else if .Values.hub.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customReadinessProbe "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.hub.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- end }}
volumeMounts: volumeMounts:
- mountPath: /etc/jupyterhub/jupyterhub_config.py - mountPath: /etc/jupyterhub/jupyterhub_config.py
subPath: jupyterhub_config.py subPath: jupyterhub_config.py

2
bitnami/jupyterhub/templates/hub/networkpolicy.yaml
View File

@@ -33,7 +33,7 @@ spec:
{{- end }} {{- end }}
# Pods with label "hub.jupyter.org/network-access-hub" --> Hub # Pods with label "hub.jupyter.org/network-access-hub" --> Hub
- ports: - ports:
- port: {{ .Values.hub.containerPort }} - port: {{ coalesce .Values.hub.containerPorts.http .Values.hub.containerPort }}
from: from:
- podSelector: - podSelector:
matchLabels: matchLabels:

10
bitnami/jupyterhub/templates/hub/pdb.yaml
View File

@@ -2,18 +2,20 @@
apiVersion: {{ include "common.capabilities.policy.apiVersion" . }} apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }} {{- if .Values.commonAnnotations }}
namespace: {{ .Release.Namespace | quote }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec: spec:
minAvailable: {{ .Values.hub.pdb.minAvailable }} minAvailable: {{ .Values.hub.pdb.minAvailable }}
maxUnavailable: {{ .Values.hub.pdb.maxUnavailable }} maxUnavailable: {{ .Values.hub.pdb.maxUnavailable }}
selector: selector:
matchLabels: matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- end }} {{- end }}

7
bitnami/jupyterhub/templates/hub/role.yaml
View File

@@ -2,16 +2,16 @@
kind: Role kind: Role
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ printf "%s-hub" (include "common.names.fullname" .) }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
namespace: {{ .Release.Namespace | quote }}
rules: rules:
- apiGroups: [""] - apiGroups: [""]
resources: ["pods", "persistentvolumeclaims"] resources: ["pods", "persistentvolumeclaims"]
@@ -19,4 +19,7 @@ rules:
- apiGroups: [""] # "" indicates the core API group - apiGroups: [""] # "" indicates the core API group
resources: ["events"] resources: ["events"]
verbs: ["get", "watch", "list"] verbs: ["get", "watch", "list"]
{{- if .Values.hub.rbac.rules }}
{{- include "common.tplvalues.render" ( dict "value" .Values.hub.rbac.rules "context" $ ) | nindent 2 }}
{{- end }}
{{- end }} {{- end }}

11
bitnami/jupyterhub/templates/hub/rolebinding.yaml
View File

@@ -2,19 +2,22 @@
kind: RoleBinding kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
metadata: metadata:
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }} {{- if .Values.commonAnnotations }}
namespace: {{ .Release.Namespace | quote }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: {{ template "jupyterhub.hubServiceAccountName" . }} name: {{ include "jupyterhub.hubServiceAccountName" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
roleRef: roleRef:
kind: Role kind: Role
name: {{ template "common.names.fullname" . }}-hub name: {{ printf "%s-hub" (include "common.names.fullname" .) }}
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
{{- end }} {{- end }}

4
bitnami/jupyterhub/templates/hub/secret.yaml
View File

@@ -2,13 +2,13 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}

15
bitnami/jupyterhub/templates/hub/service-account.yaml
View File

@@ -2,14 +2,19 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ template "jupyterhub.hubServiceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ template "jupyterhub.hubServiceAccountName" . }} annotations:
namespace: {{ .Release.Namespace | quote }} {{- if .Values.commonAnnotations }}
{{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }}
{{- end }} {{- if .Values.hub.serviceAccount.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.hub.serviceAccount.annotations "context" $ ) | nindent 4 }}
{{- end }}
automountServiceAccountToken: {{ .Values.hub.serviceAccount.automountServiceAccountToken }}
{{- end }} {{- end }}

33
bitnami/jupyterhub/templates/hub/service.yaml
View File

@@ -1,36 +1,49 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ include "jupyterhub.hub.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.hub.name" . }} annotations:
namespace: {{ .Release.Namespace | quote }} {{- if .Values.commonAnnotations }}
{{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }}
{{- end }} {{- if .Values.hub.service.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.hub.service.annotations "context" $) | nindent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.hub.service.type }} type: {{ .Values.hub.service.type }}
sessionAffinity: {{ .Values.hub.service.sessionAffinity }}
{{- if and .Values.hub.service.clusterIP (eq .Values.hub.service.type "ClusterIP") }}
clusterIP: {{ .Values.hub.service.clusterIP }}
{{- end }}
{{- if (or (eq .Values.hub.service.type "LoadBalancer") (eq .Values.hub.service.type "NodePort")) }} {{- if (or (eq .Values.hub.service.type "LoadBalancer") (eq .Values.hub.service.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.hub.service.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.hub.service.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{ if eq .Values.hub.service.type "LoadBalancer" }} {{- if (and (eq .Values.hub.service.type "LoadBalancer") .Values.hub.service.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: {{ .Values.hub.service.loadBalancerSourceRanges }} {{- with .Values.hub.service.loadBalancerSourceRanges }}
{{ end }} loadBalancerSourceRanges: {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if (and (eq .Values.hub.service.type "LoadBalancer") (not (empty .Values.hub.service.loadBalancerIP))) }} {{- if (and (eq .Values.hub.service.type "LoadBalancer") (not (empty .Values.hub.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.hub.service.loadBalancerIP }} loadBalancerIP: {{ .Values.hub.service.loadBalancerIP }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.hub.service.port }} port: {{ coalesce .Values.hub.service.ports.http .Values.hub.service.port }}
targetPort: http targetPort: http
protocol: TCP protocol: TCP
{{- if (and (or (eq .Values.hub.service.type "NodePort") (eq .Values.hub.service.type "LoadBalancer")) (not (empty .Values.hub.service.nodePorts.http))) }} {{- if and (or (eq .Values.hub.service.type "NodePort") (eq .Values.hub.service.type "LoadBalancer")) (not (empty .Values.hub.service.nodePorts.http)) }}
nodePort: {{ .Values.hub.service.nodePorts.http }} nodePort: {{ .Values.hub.service.nodePorts.http }}
{{- else if eq .Values.hub.service.type "ClusterIP" }} {{- else if eq .Values.hub.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.hub.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.hub.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub

15
bitnami/jupyterhub/templates/hub/servicemonitor.yaml
View File

@@ -21,6 +21,9 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.hub.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.hub.metrics.serviceMonitor.jobLabel }}
{{- end }}
endpoints: endpoints:
- port: http - port: http
path: {{ .Values.hub.metrics.serviceMonitor.path }} path: {{ .Values.hub.metrics.serviceMonitor.path }}
@@ -33,13 +36,19 @@ spec:
{{- if .Values.hub.metrics.serviceMonitor.honorLabels }} {{- if .Values.hub.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.hub.metrics.serviceMonitor.honorLabels }} honorLabels: {{ .Values.hub.metrics.serviceMonitor.honorLabels }}
{{- end }} {{- end }}
{{- if .Values.hub.metrics.serviceMonitor.relabellings }} {{- if .Values.hub.metrics.serviceMonitor.relabelings }}
metricRelabelings: {{- toYaml .Values.hub.metrics.serviceMonitor.relabellings | nindent 6 }} relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.hub.metrics.serviceMonitor.relabelings "context" $) | nindent 6 }}
{{- end }}
{{- if .Values.hub.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.hub.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace }} - {{ .Release.Namespace }}
selector: selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.hub.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.hub.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: hub app.kubernetes.io/component: hub
{{- end }} {{- end }}

23
bitnami/jupyterhub/templates/image-puller/daemonset.yaml
View File

@@ -2,13 +2,13 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: {{ printf "%s-image-puller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: image-puller app.kubernetes.io/component: image-puller
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ printf "%s-image-puller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
@@ -48,12 +48,21 @@ spec:
{{- if .Values.imagePuller.tolerations }} {{- if .Values.imagePuller.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.tolerations "context" .) | nindent 8 }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.tolerations "context" .) | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.imagePuller.priorityClassName }} {{- if .Values.imagePuller.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.hub.priorityClassName }}
priorityClassName: {{ .Values.imagePuller.priorityClassName | quote }} priorityClassName: {{ .Values.imagePuller.priorityClassName | quote }}
{{- end }} {{- end }}
{{- if .Values.imagePuller.schedulerName }}
schedulerName: {{ .Values.imagePuller.schedulerName }}
{{- end }}
{{- if .Values.imagePuller.podSecurityContext.enabled }} {{- if .Values.imagePuller.podSecurityContext.enabled }}
securityContext: {{- omit .Values.imagePuller.podSecurityContext "enabled" | toYaml | nindent 8 }} securityContext: {{- omit .Values.imagePuller.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.imagePuller.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.imagePuller.terminationGracePeriodSeconds }}
{{- end }}
initContainers: initContainers:
{{- range $index, $image := (list .Values.singleuser.image .Values.auxiliaryImage) }} {{- range $index, $image := (list .Values.singleuser.image .Values.auxiliaryImage) }}
- name: pull-{{ $index }} - name: pull-{{ $index }}
@@ -80,7 +89,9 @@ spec:
{{- if .Values.imagePuller.containerSecurityContext.enabled }} {{- if .Values.imagePuller.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.imagePuller.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.imagePuller.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.imagePuller.command }} {{- if .Values.diagnosticMode.enabled }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
{{- else if .Values.imagePuller.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.command "context" $) | nindent 12 }} command: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.command "context" $) | nindent 12 }}
{{- else }} {{- else }}
command: command:
@@ -88,7 +99,9 @@ spec:
- -c - -c
- sleep infinity - sleep infinity
{{- end }} {{- end }}
{{- if .Values.imagePuller.args }} {{- if .Values.diagnosticMode.enabled }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
{{- else if .Values.imagePuller.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.args "context" $) | nindent 12 }} args: {{- include "common.tplvalues.render" (dict "value" .Values.imagePuller.args "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.imagePuller.extraEnvVars }} {{- if .Values.imagePuller.extraEnvVars }}

55
bitnami/jupyterhub/templates/proxy/deployment.yaml
View File

@@ -1,13 +1,13 @@
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "jupyterhub.proxy.name" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ include "jupyterhub.proxy.name" . }}
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
@@ -20,10 +20,11 @@ spec:
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
template: template:
metadata: metadata:
{{- if .Values.proxy.podAnnotations }} annotations:
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.podAnnotations "context" $) | nindent 8 }} {{- if .Values.proxy.podAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.podAnnotations "context" $) | nindent 8 }}
{{- end }}
checksum/hub-secret: {{ include (print $.Template.BasePath "/hub/secret.yaml") . | sha256sum }} checksum/hub-secret: {{ include (print $.Template.BasePath "/hub/secret.yaml") . | sha256sum }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 8 }} labels: {{- include "common.labels.standard" . | nindent 8 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
hub.jupyter.org/network-access-hub: "true" hub.jupyter.org/network-access-hub: "true"
@@ -50,12 +51,21 @@ spec:
{{- if .Values.proxy.tolerations }} {{- if .Values.proxy.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.tolerations "context" .) | nindent 8 }} tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.tolerations "context" .) | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.proxy.topologySpreadConstraints }}
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.topologySpreadConstraints "context" .) | nindent 8 }}
{{- end }}
{{- if .Values.proxy.priorityClassName }} {{- if .Values.proxy.priorityClassName }}
priorityClassName: {{ .Values.proxy.priorityClassName | quote }} priorityClassName: {{ .Values.proxy.priorityClassName | quote }}
{{- end }} {{- end }}
{{- if .Values.proxy.schedulerName }}
schedulerName: {{ .Values.proxy.schedulerName }}
{{- end }}
{{- if .Values.proxy.podSecurityContext.enabled }} {{- if .Values.proxy.podSecurityContext.enabled }}
securityContext: {{- omit .Values.proxy.podSecurityContext "enabled" | toYaml | nindent 8 }} securityContext: {{- omit .Values.proxy.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.proxy.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ .Values.proxy.terminationGracePeriodSeconds }}
{{- end }}
{{- if .Values.proxy.initContainers }} {{- if .Values.proxy.initContainers }}
initContainers: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.initContainers "context" $) | nindent 8 }} initContainers: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.initContainers "context" $) | nindent 8 }}
{{- end }} {{- end }}
@@ -69,10 +79,14 @@ spec:
{{- if .Values.proxy.containerSecurityContext.enabled }} {{- if .Values.proxy.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.proxy.containerSecurityContext "enabled" | toYaml | nindent 12 }} securityContext: {{- omit .Values.proxy.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.proxy.command }} {{- if .Values.diagnosticMode.enabled }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
{{- else if .Values.proxy.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.command "context" $) | nindent 12 }} command: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.command "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.proxy.args }} {{- if .Values.diagnosticMode.enabled }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
{{- else if .Values.proxy.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.args "context" $) | nindent 12 }} args: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.args "context" $) | nindent 12 }}
{{- else }} {{- else }}
args: args:
@@ -80,8 +94,8 @@ spec:
- "--ip=::" - "--ip=::"
- "--api-ip=::" - "--api-ip=::"
- --api-port={{ .Values.proxy.containerPort.api }} - --api-port={{ .Values.proxy.containerPort.api }}
- --default-target=http://{{ template "common.names.fullname" . }}-hub:{{ .Values.hub.service.port }} - --default-target=http://{{ template "common.names.fullname" . }}-hub:{{ coalesce .Values.hub.service.ports.http .Values.hub.service.port }}
- --error-target=http://{{ template "common.names.fullname" . }}-hub:{{ .Values.hub.service.port }}/hub/error - --error-target=http://{{ template "common.names.fullname" . }}-hub:{{ coalesce .Values.hub.service.ports.http .Values.hub.service.port }}/hub/error
- --port={{ .Values.proxy.containerPort.http }} - --port={{ .Values.proxy.containerPort.http }}
{{- if .Values.proxy.metrics.serviceMonitor.enabled }} {{- if .Values.proxy.metrics.serviceMonitor.enabled }}
- "--metrics-ip=::" - "--metrics-ip=::"
@@ -124,45 +138,32 @@ spec:
{{- if .Values.proxy.resources }} {{- if .Values.proxy.resources }}
resources: {{- toYaml .Values.proxy.resources | nindent 12 }} resources: {{- toYaml .Values.proxy.resources | nindent 12 }}
{{- end }} {{- end }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.proxy.startupProbe.enabled }} {{- if .Values.proxy.startupProbe.enabled }}
startupProbe: startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.proxy.startupProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /_chp_healthz path: /_chp_healthz
port: http port: http
initialDelaySeconds: {{ .Values.proxy.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.proxy.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.proxy.startupProbe.timeoutSeconds }}
successThreshold: {{ .Values.proxy.startupProbe.successThreshold }}
failureThreshold: {{ .Values.proxy.startupProbe.failureThreshold }}
{{- else if .Values.proxy.customStartupProbe }} {{- else if .Values.proxy.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customStartupProbe "context" $) | nindent 12 }} startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customStartupProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.proxy.livenessProbe.enabled }} {{- if .Values.proxy.livenessProbe.enabled }}
livenessProbe: livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.proxy.livenessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /_chp_healthz path: /_chp_healthz
port: http port: http
initialDelaySeconds: {{ .Values.proxy.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.proxy.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.proxy.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.proxy.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.proxy.livenessProbe.failureThreshold }}
{{- else if .Values.proxy.customLivenessProbe }} {{- else if .Values.proxy.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customLivenessProbe "context" $) | nindent 12 }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customLivenessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.proxy.readinessProbe.enabled }} {{- if .Values.proxy.readinessProbe.enabled }}
readinessProbe: readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.proxy.readinessProbe "enabled") "context" $) | nindent 12 }}
httpGet: httpGet:
path: /_chp_healthz path: /_chp_healthz
port: http port: http
initialDelaySeconds: {{ .Values.proxy.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.proxy.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.proxy.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.proxy.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.proxy.readinessProbe.failureThreshold }}
{{- else if .Values.proxy.customReadinessProbe }} {{- else if .Values.proxy.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customReadinessProbe "context" $) | nindent 12 }} readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customReadinessProbe "context" $) | nindent 12 }}
{{- end }} {{- end }}
{{- end }}
volumeMounts: volumeMounts:
{{- if .Values.proxy.extraVolumeMounts }} {{- if .Values.proxy.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.extraVolumeMounts "context" $) | nindent 12 }} {{- include "common.tplvalues.render" (dict "value" .Values.proxy.extraVolumeMounts "context" $) | nindent 12 }}

2
bitnami/jupyterhub/templates/proxy/networkpolicy.yaml
View File

@@ -40,7 +40,7 @@ spec:
egress: egress:
# Proxy --> Hub # Proxy --> Hub
- ports: - ports:
- port: {{ .Values.hub.containerPort }} - port: {{ coalesce .Values.hub.containerPorts.http .Values.hub.containerPort }}
to: to:
- podSelector: - podSelector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }}

31
bitnami/jupyterhub/templates/proxy/service-api.yaml
View File

@@ -1,30 +1,40 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ printf "%s-proxy-api" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ printf "%s-proxy-api" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} annotations:
namespace: {{ .Release.Namespace | quote }} {{- if .Values.commonAnnotations }}
{{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }}
{{- end }} {{- if .Values.proxy.service.api.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.api.annotations "context" $) | nindent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.proxy.service.api.type }} type: {{ .Values.proxy.service.api.type }}
sessionAffinity: {{ .Values.proxy.service.api.sessionAffinity }}
{{- if and .Values.proxy.service.api.clusterIP (eq .Values.proxy.service.api.type "ClusterIP") }}
clusterIP: {{ .Values.proxy.service.api.clusterIP }}
{{- end }}
{{- if (or (eq .Values.proxy.service.api.type "LoadBalancer") (eq .Values.proxy.service.api.type "NodePort")) }} {{- if (or (eq .Values.proxy.service.api.type "LoadBalancer") (eq .Values.proxy.service.api.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.proxy.service.api.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.proxy.service.api.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{ if eq .Values.proxy.service.api.type "LoadBalancer" }} {{- if (and (eq .Values.proxy.service.api.type "LoadBalancer") .Values.proxy.service.api.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: {{ .Values.proxy.service.api.loadBalancerSourceRanges }} {{- with .Values.proxy.service.api.loadBalancerSourceRanges }}
{{ end }} loadBalancerSourceRanges: {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if (and (eq .Values.proxy.service.api.type "LoadBalancer") (not (empty .Values.proxy.service.api.loadBalancerIP))) }} {{- if (and (eq .Values.proxy.service.api.type "LoadBalancer") (not (empty .Values.proxy.service.api.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.proxy.service.api.loadBalancerIP }} loadBalancerIP: {{ .Values.proxy.service.api.loadBalancerIP }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.proxy.service.api.port }} port: {{ coalesce .Values.proxy.service.api.ports.http .Values.proxy.service.api.port }}
targetPort: api targetPort: api
protocol: TCP protocol: TCP
{{- if (and (or (eq .Values.proxy.service.api.type "NodePort") (eq .Values.proxy.service.api.type "LoadBalancer")) (not (empty .Values.proxy.service.api.nodePorts.http))) }} {{- if (and (or (eq .Values.proxy.service.api.type "NodePort") (eq .Values.proxy.service.api.type "LoadBalancer")) (not (empty .Values.proxy.service.api.nodePorts.http))) }}
@@ -32,5 +42,8 @@ spec:
{{- else if eq .Values.proxy.service.api.type "ClusterIP" }} {{- else if eq .Values.proxy.service.api.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.proxy.service.api.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.api.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy

31
bitnami/jupyterhub/templates/proxy/service-metrics.yaml
View File

@@ -3,30 +3,40 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ printf "%s-proxy-metrics" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ printf "%s-proxy-metrics" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} annotations:
namespace: {{ .Release.Namespace | quote }} {{- if .Values.commonAnnotations }}
{{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }}
{{- end }} {{- if .Values.proxy.service.metrics.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.metrics.annotations "context" $) | nindent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.proxy.service.metrics.type }} type: {{ .Values.proxy.service.metrics.type }}
sessionAffinity: {{ .Values.proxy.service.metrics.sessionAffinity }}
{{- if and .Values.proxy.service.metrics.clusterIP (eq .Values.proxy.service.metrics.type "ClusterIP") }}
clusterIP: {{ .Values.proxy.service.metrics.clusterIP }}
{{- end }}
{{- if (or (eq .Values.proxy.service.metrics.type "LoadBalancer") (eq .Values.proxy.service.metrics.type "NodePort")) }} {{- if (or (eq .Values.proxy.service.metrics.type "LoadBalancer") (eq .Values.proxy.service.metrics.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.proxy.service.metrics.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.proxy.service.metrics.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{ if eq .Values.proxy.service.metrics.type "LoadBalancer" }} {{- if (and (eq .Values.proxy.service.metrics.type "LoadBalancer") .Values.proxy.service.metrics.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: {{ .Values.proxy.service.metrics.loadBalancerSourceRanges }} {{- with .Values.proxy.service.metrics.loadBalancerSourceRanges }}
{{ end }} loadBalancerSourceRanges: {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if (and (eq .Values.proxy.service.metrics.type "LoadBalancer") (not (empty .Values.proxy.service.metrics.loadBalancerIP))) }} {{- if (and (eq .Values.proxy.service.metrics.type "LoadBalancer") (not (empty .Values.proxy.service.metrics.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.proxy.service.metrics.loadBalancerIP }} loadBalancerIP: {{ .Values.proxy.service.metrics.loadBalancerIP }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.proxy.service.metrics.port }} port: {{ coalesce .Values.proxy.service.metrics.ports.http .Values.proxy.service.metrics.port }}
targetPort: metrics targetPort: metrics
protocol: TCP protocol: TCP
{{- if (and (or (eq .Values.proxy.service.metrics.type "NodePort") (eq .Values.proxy.service.metrics.type "LoadBalancer")) (not (empty .Values.proxy.service.metrics.nodePorts.http))) }} {{- if (and (or (eq .Values.proxy.service.metrics.type "NodePort") (eq .Values.proxy.service.metrics.type "LoadBalancer")) (not (empty .Values.proxy.service.metrics.nodePorts.http))) }}
@@ -34,6 +44,9 @@ spec:
{{- else if eq .Values.proxy.service.metrics.type "ClusterIP" }} {{- else if eq .Values.proxy.service.metrics.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.proxy.service.metrics.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.metrics.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- end }} {{- end }}

31
bitnami/jupyterhub/templates/proxy/service-public.yaml
View File

@@ -1,30 +1,40 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: {{ printf "%s-proxy-public" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ printf "%s-proxy-public" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }} annotations:
namespace: {{ .Release.Namespace | quote }} {{- if .Values.commonAnnotations }}
{{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }}
{{- end }} {{- if .Values.proxy.service.public.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.public.annotations "context" $) | nindent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.proxy.service.public.type }} type: {{ .Values.proxy.service.public.type }}
sessionAffinity: {{ .Values.proxy.service.public.sessionAffinity }}
{{- if and .Values.proxy.service.public.clusterIP (eq .Values.proxy.service.public.type "ClusterIP") }}
clusterIP: {{ .Values.proxy.service.public.clusterIP }}
{{- end }}
{{- if (or (eq .Values.proxy.service.public.type "LoadBalancer") (eq .Values.proxy.service.public.type "NodePort")) }} {{- if (or (eq .Values.proxy.service.public.type "LoadBalancer") (eq .Values.proxy.service.public.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.proxy.service.public.externalTrafficPolicy | quote }} externalTrafficPolicy: {{ .Values.proxy.service.public.externalTrafficPolicy | quote }}
{{- end }} {{- end }}
{{ if eq .Values.proxy.service.public.type "LoadBalancer" }} {{- if (and (eq .Values.proxy.service.public.type "LoadBalancer") .Values.proxy.service.public.loadBalancerSourceRanges) }}
loadBalancerSourceRanges: {{ .Values.proxy.service.public.loadBalancerSourceRanges }} {{- with .Values.proxy.service.public.loadBalancerSourceRanges }}
{{ end }} loadBalancerSourceRanges: {{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- if (and (eq .Values.proxy.service.public.type "LoadBalancer") (not (empty .Values.proxy.service.public.loadBalancerIP))) }} {{- if (and (eq .Values.proxy.service.public.type "LoadBalancer") (not (empty .Values.proxy.service.public.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.proxy.service.public.loadBalancerIP }} loadBalancerIP: {{ .Values.proxy.service.public.loadBalancerIP }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http
port: {{ .Values.proxy.service.public.port }} port: {{ coalesce .Values.proxy.service.public.ports.http .Values.proxy.service.public.port }}
targetPort: http targetPort: http
protocol: TCP protocol: TCP
{{- if (and (or (eq .Values.proxy.service.public.type "NodePort") (eq .Values.proxy.service.public.type "LoadBalancer")) (not (empty .Values.proxy.service.public.nodePorts.http))) }} {{- if (and (or (eq .Values.proxy.service.public.type "NodePort") (eq .Values.proxy.service.public.type "LoadBalancer")) (not (empty .Values.proxy.service.public.nodePorts.http))) }}
@@ -32,5 +42,8 @@ spec:
{{- else if eq .Values.proxy.service.public.type "ClusterIP" }} {{- else if eq .Values.proxy.service.public.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if .Values.proxy.service.public.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.service.public.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }} selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy

15
bitnami/jupyterhub/templates/proxy/servicemonitor.yaml
View File

@@ -21,6 +21,9 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.proxy.metrics.serviceMonitor.jobLabel }}
jobLabel: {{ .Values.proxy.metrics.serviceMonitor.jobLabel }}
{{- end }}
endpoints: endpoints:
- port: metrics - port: metrics
path: {{ .Values.proxy.metrics.serviceMonitor.path }} path: {{ .Values.proxy.metrics.serviceMonitor.path }}
@@ -33,13 +36,19 @@ spec:
{{- if .Values.proxy.metrics.serviceMonitor.honorLabels }} {{- if .Values.proxy.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.proxy.metrics.serviceMonitor.honorLabels }} honorLabels: {{ .Values.proxy.metrics.serviceMonitor.honorLabels }}
{{- end }} {{- end }}
{{- if .Values.proxy.metrics.serviceMonitor.relabellings }} {{- if .Values.proxy.metrics.serviceMonitor.relabelings }}
metricRelabelings: {{- toYaml .Values.proxy.metrics.serviceMonitor.relabellings | nindent 6 }} relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.proxy.metrics.serviceMonitor.relabelings "context" $) | nindent 6 }}
{{- end }}
{{- if .Values.proxy.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- toYaml .Values.proxy.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }} {{- end }}
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- {{ .Release.Namespace }} - {{ .Release.Namespace }}
selector: selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
{{- if .Values.proxy.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.metrics.serviceMonitor.selector "context" $) | nindent 6 }}
{{- end }}
app.kubernetes.io/component: proxy app.kubernetes.io/component: proxy
{{- end }} {{- end }}

1
bitnami/jupyterhub/templates/proxy/tls-secret.yaml
View File

@@ -41,5 +41,6 @@ data:
tls.crt: {{ $cert.Cert | b64enc | quote }} tls.crt: {{ $cert.Cert | b64enc | quote }}
tls.key: {{ $cert.Key | b64enc | quote }} tls.key: {{ $cert.Key | b64enc | quote }}
ca.crt: {{ $ca.Cert | b64enc | quote }} ca.crt: {{ $ca.Cert | b64enc | quote }}
---
{{- end }} {{- end }}
{{- end }} {{- end }}

2
bitnami/jupyterhub/templates/singleuser/networkpolicy.yaml
View File

@@ -40,7 +40,7 @@ spec:
egress: egress:
# Single User --> Hub # Single User --> Hub
- ports: - ports:
- port: {{ .Values.hub.containerPort }} - port: {{ coalesce .Values.hub.containerPorts.http .Values.hub.containerPort }}
to: to:
- podSelector: - podSelector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }} matchLabels: {{- include "common.labels.matchLabels" . | nindent 14 }}

15
bitnami/jupyterhub/templates/singleuser/service-account.yaml
View File

@@ -2,14 +2,19 @@
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ template "jupyterhub.singleuserServiceAccountName" . }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }} labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: singleuser app.kubernetes.io/component: singleuser
{{- if .Values.commonLabels }} {{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
name: {{ template "jupyterhub.singleuserServiceAccountName" . }} annotations:
{{- if .Values.commonAnnotations }} {{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
namespace: {{ .Release.Namespace | quote }} {{- if .Values.singleuser.serviceAccount.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.singleuser.serviceAccount.annotations "context" $ ) | nindent 4 }}
{{- end }}
automountServiceAccountToken: {{ .Values.singleuser.serviceAccount.automountServiceAccountToken }}
{{- end }} {{- end }}

1081
bitnami/jupyterhub/values.yaml
View File

File diff suppressed because it is too large Load Diff