diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml index 526cbb359a..335cf7ec7b 100644 --- a/apps/admission-webhook/upstream/base/kustomization.yaml +++ b/apps/admission-webhook/upstream/base/kustomization.yaml @@ -16,7 +16,7 @@ commonLabels: images: - name: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook newName: public.ecr.aws/j1r0q0g6/notebooks/admission-webhook - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 namespace: kubeflow generatorOptions: disableNameSuffixHash: true diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml index ccaa0fe997..b297758d6d 100644 --- a/apps/centraldashboard/upstream/base/kustomization.yaml +++ b/apps/centraldashboard/upstream/base/kustomization.yaml @@ -18,7 +18,7 @@ commonLabels: images: - name: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard newName: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 configMapGenerator: - envs: - params.env diff --git a/apps/jupyter/jupyter-web-app/upstream/base/configs/logos-configmap.yaml b/apps/jupyter/jupyter-web-app/upstream/base/configs/logos-configmap.yaml new file mode 100644 index 0000000000..2e32fc8e52 --- /dev/null +++ b/apps/jupyter/jupyter-web-app/upstream/base/configs/logos-configmap.yaml @@ -0,0 +1,191 @@ +apiVersion: v1 +data: + jupyter-icon.svg: | + + Created using Figma 0.90 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jupyterlab-logo.svg: | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group-two-icon.svg: |- + + + + + + + + + group-two-logo.svg: |- + + + + + + + + + group-one-icon.svg: |- + + + + + + + + + group-one-logo.svg: |- + + + + + + + + +kind: ConfigMap +metadata: + name: logos diff --git a/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml b/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml index ed82e187f7..434b636bed 100644 --- a/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml +++ b/apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml @@ -17,26 +17,35 @@ spawnerFormDefaults: image: # The container Image for the user's Jupyter Notebook - value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.3.0-rc.0 + value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.3.0-rc.1 # The list of available standard container Images options: - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.3.0-rc.0 - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:v1.3.0-rc.0 - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:v1.3.0-rc.0 - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:v1.3.0-rc.0 - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:v1.3.0-rc.0 - imageVSCode: - # The container Image for the user's VS-Code Server - value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.3.0-rc.0 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:v1.3.0-rc.1 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:v1.3.0-rc.1 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:v1.3.0-rc.1 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:v1.3.0-rc.1 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:v1.3.0-rc.1 + imageGroupOne: + # The container Image for the user's Group One Server + # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /` + # is applied to notebook in this group, configuring + # the Istio rewrite for containers that host their web UI at `/` + value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.3.0-rc.1 # The list of available standard container Images options: - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.3.0-rc.0 - imageRStudio: - # The container Image for the user's RStudio Server - value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.3.0-rc.0 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:v1.3.0-rc.1 + imageGroupTwo: + # The container Image for the user's Group Two Server + # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /` + # is applied to notebook in this group, configuring + # the Istio rewrite for containers that host their web UI at `/` + # The annotation `notebooks.kubeflow.org/http-headers-request-set` + # is applied to notebook in this group, configuring Istio + # to add the `X-RStudio-Root-Path` header to requests + value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.3.0-rc.1 # The list of available standard container Images options: - - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.3.0-rc.0 + - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:v1.3.0-rc.1 allowCustomImage: true imagePullPolicy: value: IfNotPresent @@ -44,10 +53,16 @@ spawnerFormDefaults: cpu: # CPU for user's Notebook value: '0.5' + # Factor by with to multiply request to calculate limit + # if no limit is set, to disable set "none" + limitFactor: "1.2" readOnly: false memory: # Memory for user's Notebook value: 1.0Gi + # Factor by with to multiply request to calculate limit + # if no limit is set, to disable set "none" + limitFactor: "1.2" readOnly: false workspaceVolume: # Workspace Volume to be attached to user's Notebook diff --git a/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml b/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml index ff7bdf8976..dff3d93a68 100644 --- a/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml +++ b/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml @@ -17,6 +17,8 @@ spec: volumeMounts: - mountPath: /etc/config name: config-volume + - mountPath: /src/apps/default/static/assets + name: logos-volume env: - name: APP_PREFIX value: $(JWA_PREFIX) @@ -31,3 +33,6 @@ spec: - configMap: name: config name: config-volume + - configMap: + name: jupyter-web-app-logos + name: logos-volume diff --git a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml index 56d48a974a..3d67084533 100644 --- a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml +++ b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml @@ -14,6 +14,7 @@ resources: - role.yaml - service-account.yaml - service.yaml +- configs/logos-configmap.yaml namePrefix: jupyter-web-app- namespace: kubeflow commonLabels: @@ -22,7 +23,7 @@ commonLabels: images: - name: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app newName: public.ecr.aws/j1r0q0g6/notebooks/jupyter-web-app - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 # We need the name to be unique without the suffix because the original name is what # gets used with patches configMapGenerator: diff --git a/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml b/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml index 31eb6446c6..3a63590a04 100644 --- a/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml +++ b/apps/jupyter/notebook-controller/upstream/base/kustomization.yaml @@ -5,4 +5,4 @@ resources: images: - name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller newName: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 diff --git a/apps/profiles/upstream/base/kustomization.yaml b/apps/profiles/upstream/base/kustomization.yaml index 6a205a3d86..c2f98321e9 100644 --- a/apps/profiles/upstream/base/kustomization.yaml +++ b/apps/profiles/upstream/base/kustomization.yaml @@ -9,4 +9,4 @@ resources: images: - name: public.ecr.aws/j1r0q0g6/notebooks/profile-controller newName: public.ecr.aws/j1r0q0g6/notebooks/profile-controller - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 diff --git a/apps/profiles/upstream/crd/bases/kubeflow.org_profiles.yaml b/apps/profiles/upstream/crd/bases/kubeflow.org_profiles.yaml index ccff042b94..7d878b5726 100644 --- a/apps/profiles/upstream/crd/bases/kubeflow.org_profiles.yaml +++ b/apps/profiles/upstream/crd/bases/kubeflow.org_profiles.yaml @@ -63,6 +63,7 @@ spec: type: string spec: type: object + x-kubernetes-preserve-unknown-fields: true type: object type: array resourceQuotaSpec: @@ -177,6 +178,7 @@ spec: type: string spec: type: object + x-kubernetes-preserve-unknown-fields: true type: object type: array resourceQuotaSpec: diff --git a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml index 06e46a79e2..284a36c561 100644 --- a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml +++ b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml @@ -28,4 +28,4 @@ vars: images: - name: public.ecr.aws/j1r0q0g6/notebooks/access-management newName: public.ecr.aws/j1r0q0g6/notebooks/access-management - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 diff --git a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml index 478d56aec6..8bc64a8dc5 100644 --- a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml +++ b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml @@ -36,4 +36,4 @@ patches: images: - name: public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller newName: public.ecr.aws/j1r0q0g6/notebooks/tensorboard-controller - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 diff --git a/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml index d854037fe2..958f1069f1 100644 --- a/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml +++ b/apps/tensorboard/tensorboards-web-app/upstream/base/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: images: - name: public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app newName: public.ecr.aws/j1r0q0g6/notebooks/tensorboards-web-app - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 # We need the name to be unique without the suffix because the original name is what # gets used with patches configMapGenerator: diff --git a/apps/volumes-web-app/upstream/base/kustomization.yaml b/apps/volumes-web-app/upstream/base/kustomization.yaml index e565814b4b..a3b181a5f8 100644 --- a/apps/volumes-web-app/upstream/base/kustomization.yaml +++ b/apps/volumes-web-app/upstream/base/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: images: - name: public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app newName: public.ecr.aws/j1r0q0g6/notebooks/volumes-web-app - newTag: v1.3.0-rc.0 + newTag: v1.3.0-rc.1 # We need the name to be unique without the suffix because the original name is what # gets used with patches configMapGenerator: