Sync wg-notebooks apps to revision 1.3.0-rc.1

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

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

apps/jupyter/jupyter-web-app/upstream/base/configs/spawner_ui_config.yaml

@@ -17,37 +17,52 @@
 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
     readOnly: false
   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

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

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:

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

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

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:

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

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

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:

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: