diff --git a/charts/quantum-serverless/Chart.lock b/charts/quantum-serverless/Chart.lock index a15713b4e..2f0a5e6f8 100644 --- a/charts/quantum-serverless/Chart.lock +++ b/charts/quantum-serverless/Chart.lock @@ -2,9 +2,6 @@ dependencies: - name: gateway repository: "" version: 0.8.2 -- name: jupyter - repository: "" - version: 0.8.2 - name: nginx-ingress-controller repository: https://charts.bitnami.com/bitnami version: 9.9.4 @@ -17,5 +14,5 @@ dependencies: - name: repository repository: "" version: 0.8.2 -digest: sha256:7098fcf09532c0f5452b9ae5b93c2d844347065cc01ecf5927be3e2662072c74 -generated: "2024-01-05T15:55:50.700792989Z" +digest: sha256:184a618f36afdd71889b109c5742f3c041daa597a992f7a928d4ade6c439d88d +generated: "2024-01-24T13:22:13.904429-05:00" diff --git a/charts/quantum-serverless/Chart.yaml b/charts/quantum-serverless/Chart.yaml index 6886cc1fa..971f930b8 100644 --- a/charts/quantum-serverless/Chart.yaml +++ b/charts/quantum-serverless/Chart.yaml @@ -11,9 +11,6 @@ dependencies: - name: gateway condition: gatewayEnable version: 0.8.2 - - name: jupyter - condition: jupyterEnable - version: 0.8.2 - name: nginx-ingress-controller condition: nginxIngressControllerEnable version: 9.9.4 diff --git a/charts/quantum-serverless/README.md b/charts/quantum-serverless/README.md index 2b89c7425..dd5f641cc 100644 --- a/charts/quantum-serverless/README.md +++ b/charts/quantum-serverless/README.md @@ -34,22 +34,10 @@ The Quantum Serverless Chart has several internal and external dependencies. If **Nginx Ingress controller** -For our Nginx Ingress controller dependency we are using the configuration created by Bitnami. To simplify the configuration we offered you with a straigh-forward initial parameters setup. +For our Nginx Ingress controller dependency we are using the configuration created by Bitnami. To simplify the configuration we offered you with a straigh-forward initial parameters setup. But if you are interested in more complex configurations you have access to all the parameters that Bitnami added in the chart specified in their READMEs: * [Nginx Ingress controller's README](https://artifacthub.io/packages/helm/bitnami/nginx-ingress-controller) -**Jupyter notebook** - -| Name | Description | -|---------------------------|-------------------------------------------------------------------| -| jupyterEnable | Specify if helm will execute the jupyter configuration. | -| jupyter.jupyterToken | Password for jupyter notebook. | -| jupyter.image | Docker image configuration to deploy the notebook. | -| jupyter.imagePullSecrets | Secrets to pull the image from a private registry. | -| jupyter.container.port | Port number that the pod will use in the cluster. | -| jupyter.service.port | Port number that service will be exposed externally. | -| jupyter.ingress.enabled | Specifies if you are going to use ingress to expose the service. | - **Kuberay operator** For our KubeRay Chart dependency we are using the configuration created by the Ray Project. To simplify the configuration we offered you with a straigh-forward initial parameters setup. But if you are interested in more complex configurations you have access to their Helm project [in GitHub](https://github.com/ray-project/kuberay-helm) to analyze the different variables: diff --git a/charts/quantum-serverless/charts/jupyter/.helmignore b/charts/quantum-serverless/charts/jupyter/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/charts/quantum-serverless/charts/jupyter/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/quantum-serverless/charts/jupyter/Chart.yaml b/charts/quantum-serverless/charts/jupyter/Chart.yaml deleted file mode 100644 index a73a95fa6..000000000 --- a/charts/quantum-serverless/charts/jupyter/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: jupyter -description: Jupyter helm chart to deploy a jupyter in Kubernetes. - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.2 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "0.8.2" diff --git a/charts/quantum-serverless/charts/jupyter/templates/NOTES.txt b/charts/quantum-serverless/charts/jupyter/templates/NOTES.txt deleted file mode 100644 index d96ccc1a2..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "jupyter.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "jupyter.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "jupyter.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "jupyter.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/_helpers.tpl b/charts/quantum-serverless/charts/jupyter/templates/_helpers.tpl deleted file mode 100644 index 665f0f6b8..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "jupyter.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "jupyter.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "jupyter.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "jupyter.labels" -}} -helm.sh/chart: {{ include "jupyter.chart" . }} -{{ include "jupyter.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "jupyter.selectorLabels" -}} -app.kubernetes.io/name: {{ include "jupyter.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "jupyter.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "jupyter.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/deployment.yaml b/charts/quantum-serverless/charts/jupyter/templates/deployment.yaml deleted file mode 100644 index 6eed7fcff..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "jupyter.fullname" . }} - labels: - {{- include "jupyter.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "jupyter.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "jupyter.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "jupyter.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.container.port }} - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - env: - - name: JUPYTER_TOKEN - value: {{ .Values.jupyterToken | quote }} - - name: QS_CLUSTER_MANAGER_ADDRESS - value: "http://{{ .Release.Name }}-manager:{{ .Values.managerPort }}" - - name: GATEWAY_HOST - value: {{ .Values.gatewayHost }} - - name: OTEL_ENABLED - value: {{ .Values.openTelemetryCollector.enabled | quote }} - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: {{ .Values.openTelemetryCollector.host }}:{{ .Values.openTelemetryCollector.port }} - - name: OTEL_EXPORTER_OTLP_TRACES_INSECURE - value: {{ .Values.openTelemetryCollector.insecure | quote }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/hpa.yaml b/charts/quantum-serverless/charts/jupyter/templates/hpa.yaml deleted file mode 100644 index 80ffd3bf3..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "jupyter.fullname" . }} - labels: - {{- include "jupyter.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "jupyter.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/ingress.yaml b/charts/quantum-serverless/charts/jupyter/templates/ingress.yaml deleted file mode 100644 index 9277037bf..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/ingress.yaml +++ /dev/null @@ -1,65 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "jupyter.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "jupyter.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -status: - loadBalancer: - ingress: - - hostname: {{ .Values.ingress.loadBalancer.hostname }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/service.yaml b/charts/quantum-serverless/charts/jupyter/templates/service.yaml deleted file mode 100644 index ecf2869c3..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "jupyter.fullname" . }} - labels: - {{- include "jupyter.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} # ClusterIP - ports: - - protocol: TCP - targetPort: {{ .Values.container.port }} - port: {{ .Values.service.port }} - name: http - selector: - {{- include "jupyter.selectorLabels" . | nindent 4 }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/serviceaccount.yaml b/charts/quantum-serverless/charts/jupyter/templates/serviceaccount.yaml deleted file mode 100644 index 0a76d6ef2..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "jupyter.serviceAccountName" . }} - labels: - {{- include "jupyter.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/quantum-serverless/charts/jupyter/templates/tests/test-connection.yaml b/charts/quantum-serverless/charts/jupyter/templates/tests/test-connection.yaml deleted file mode 100644 index 7c22fa304..000000000 --- a/charts/quantum-serverless/charts/jupyter/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "jupyter.fullname" . }}-test-connection" - labels: - {{- include "jupyter.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "jupyter.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/quantum-serverless/charts/jupyter/values.yaml b/charts/quantum-serverless/charts/jupyter/values.yaml deleted file mode 100644 index d0e03e509..000000000 --- a/charts/quantum-serverless/charts/jupyter/values.yaml +++ /dev/null @@ -1,96 +0,0 @@ -# Default values for jupyter. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -jupyterToken: "123" -managerHost: "" -managerPort: 5000 -gatewayHost: http://gateway:8000 - -replicaCount: 1 - -image: - repository: "" - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "latest-py39" - -container: - port: 8888 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -openTelemetryCollector: - enabled: 0 - port: 4317 - host: "http://otel-collector" - insecure: 0 - -serviceAccount: - # Specifies whether a service account should be created - create: false - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: localhost - paths: - - path: / - pathType: Prefix - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/charts/quantum-serverless/values.yaml b/charts/quantum-serverless/values.yaml index 578416f14..ead7d5d02 100644 --- a/charts/quantum-serverless/values.yaml +++ b/charts/quantum-serverless/values.yaml @@ -96,26 +96,6 @@ gateway: password: passw0rd email: admin@examplemail.io -# =================== -# Jupyter configs -# =================== - -jupyterEnable: false -jupyter: - nameOverride: "jupyter" - fullnameOverride: "jupyter" - - jupyterToken: "YOUR_JUPYTER_PASSWORD_HERE" - - image: - repository: "icr.io/quantum-public/quantum-serverless-notebook" - tag: "0.8.2-py39" - pullPolicy: IfNotPresent - container: - port: 8888 - service: - port: 80 - # =================== # Kuberay Operator # ===================