Synchronize kubeflow kubeflow manifests v1.10.0 rc.0 (#2995)

* Update kubeflow/kubeflow manifests from v1.10.0-rc.0 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * update script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --------- Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com>
kubeflow · Feb 14, 2025 · eb3c1cd · eb3c1cd
1 parent 54fbe2b
commit eb3c1cd
Show file tree

Hide file tree

Showing 25 changed files with 69 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -45,15 +45,15 @@ This repo periodically syncs all official Kubeflow components from their respect
 | Component | Local Manifests Path | Upstream Revision |
 | - | - | - |
 | Training Operator | apps/training-operator/upstream | [778cd72](https://github.com/kubeflow/training-operator/tree/778cd72/manifests) |
-| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/notebook-controller/config) |
-| PVC Viewer Controller | apps/pvcviewer-controller/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/pvcviewer-controller/config) |
-| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/tensorboard-controller/config) |
-| Central Dashboard | apps/centraldashboard/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/centraldashboard/manifests) |
-| Profiles + KFAM | apps/profiles/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/profile-controller/config) |
-| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/admission-webhook/manifests) |
-| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/crud-web-apps/jupyter/manifests) |
-| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/crud-web-apps/tensorboards/manifests) |
-| Volumes Web App | apps/volumes-web-app/upstream | [v1.9.2](https://github.com/kubeflow/kubeflow/tree/v1.9.2/components/crud-web-apps/volumes/manifests) |
+| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/notebook-controller/config) |
+| PVC Viewer Controller | apps/pvcviewer-controller/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/pvcviewer-controller/config) |
+| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/tensorboard-controller/config) |
+| Central Dashboard | apps/centraldashboard/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/centraldashboard/manifests) |
+| Profiles + KFAM | apps/profiles/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/profile-controller/config) |
+| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/admission-webhook/manifests) |
+| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/crud-web-apps/jupyter/manifests) |
+| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/crud-web-apps/tensorboards/manifests) |
+| Volumes Web App | apps/volumes-web-app/upstream | [v1.10.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.10.0-rc.0/components/crud-web-apps/volumes/manifests) |
 | Katib | apps/katib/upstream | [v0.18.0-rc.0](https://github.com/kubeflow/katib/tree/v0.18.0-rc.0/manifests/v1beta1) |
 | KServe | contrib/kserve/kserve | [v0.14.1](https://github.com/kserve/kserve/releases/tag/v0.14.1/install/v0.14.1) |
 | KServe Models Web App | contrib/kserve/models-web-app | [0.13.0](https://github.com/kserve/models-web-app/tree/0.13.0/config) |

diff --git a/apps/admission-webhook/upstream/base/kustomization.yaml b/apps/admission-webhook/upstream/base/kustomization.yaml
@@ -16,7 +16,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/poddefaults-webhook
   newName: docker.io/kubeflownotebookswg/poddefaults-webhook
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

diff --git a/apps/centraldashboard/upstream/base/deployment.yaml b/apps/centraldashboard/upstream/base/deployment.yaml
@@ -46,4 +46,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: COLLECT_METRICS
+          value: CD_COLLECT_METRICS
       serviceAccountName: centraldashboard
diff --git a/apps/centraldashboard/upstream/base/kustomization.yaml b/apps/centraldashboard/upstream/base/kustomization.yaml
@@ -13,7 +13,7 @@ resources:
 images:
 - name: docker.io/kubeflownotebookswg/centraldashboard
   newName: docker.io/kubeflownotebookswg/centraldashboard
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 configMapGenerator:
 - envs:
   - params.env

diff --git a/apps/centraldashboard/upstream/base/params.env b/apps/centraldashboard/upstream/base/params.env
@@ -1,4 +1,5 @@
 CD_CLUSTER_DOMAIN=cluster.local
 CD_USERID_HEADER=kubeflow-userid
 CD_USERID_PREFIX=
-CD_REGISTRATION_FLOW=false
+CD_REGISTRATION_FLOW=false
+CD_COLLECT_METRICS=true
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
@@ -37,16 +37,16 @@ spawnerFormDefaults:
   ################################################################
   image:
     # the default container image
-    value: kubeflownotebookswg/jupyter-scipy:v1.9.2
+    value: kubeflownotebookswg/jupyter-scipy:v1.10.0-rc.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/jupyter-scipy:v1.9.2
-    - kubeflownotebookswg/jupyter-pytorch-full:v1.9.2
-    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.9.2
-    - kubeflownotebookswg/jupyter-pytorch-gaudi-full:v1.9.2
-    - kubeflownotebookswg/jupyter-tensorflow-full:v1.9.2
-    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.9.2
+    - kubeflownotebookswg/jupyter-scipy:v1.10.0-rc.0
+    - kubeflownotebookswg/jupyter-pytorch-full:v1.10.0-rc.0
+    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.10.0-rc.0
+    - kubeflownotebookswg/jupyter-pytorch-gaudi-full:v1.10.0-rc.0
+    - kubeflownotebookswg/jupyter-tensorflow-full:v1.10.0-rc.0
+    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.10.0-rc.0
 
   ################################################################
   # VSCode-like Container Images (Group 1)
@@ -61,11 +61,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupOne:
     # the default container image
-    value: kubeflownotebookswg/codeserver-python:v1.9.2
+    value: kubeflownotebookswg/codeserver-python:v1.10.0-rc.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/codeserver-python:v1.9.2
+    - kubeflownotebookswg/codeserver-python:v1.10.0-rc.0
 
   ################################################################
   # RStudio-like Container Images (Group 2)
@@ -82,11 +82,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupTwo:
     # the default container image
-    value: kubeflownotebookswg/rstudio-tidyverse:v1.9.2
+    value: kubeflownotebookswg/rstudio-tidyverse:v1.10.0-rc.0
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/rstudio-tidyverse:v1.9.2
+    - kubeflownotebookswg/rstudio-tidyverse:v1.10.0-rc.0
 
   ################################################################
   # CPU Resources

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml b/apps/jupyter/jupyter-web-app/upstream/base/deployment.yaml
@@ -27,6 +27,8 @@ spec:
           value: $(JWA_USERID_PREFIX)
         - name: APP_SECURE_COOKIES
           value: $(JWA_APP_SECURE_COOKIES)
+        - name: METRICS
+          value: $(JWA_APP_ENABLE_METRICS)
       serviceAccountName: service-account
       volumes:
       - configMap:

diff --git a/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml b/apps/jupyter/jupyter-web-app/upstream/base/kustomization.yaml
@@ -23,7 +23,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/jupyter-web-app
   newName: docker.io/kubeflownotebookswg/jupyter-web-app
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:
@@ -83,3 +83,10 @@ vars:
     apiVersion: v1
     kind: ConfigMap
     name: parameters
+- name: JWA_APP_ENABLE_METRICS
+  fieldref:
+    fieldPath: data.JWA_APP_ENABLE_METRICS
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: parameters
diff --git a/apps/jupyter/jupyter-web-app/upstream/base/params.env b/apps/jupyter/jupyter-web-app/upstream/base/params.env
@@ -4,3 +4,4 @@ JWA_CLUSTER_DOMAIN=cluster.local
 JWA_USERID_HEADER=kubeflow-userid
 JWA_USERID_PREFIX=
 JWA_APP_SECURE_COOKIES=true
+JWA_APP_ENABLE_METRICS=1
diff --git 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: docker.io/kubeflownotebookswg/notebook-controller
   newName: docker.io/kubeflownotebookswg/notebook-controller
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
diff --git a/apps/jupyter/notebook-controller/upstream/default/manager_auth_proxy_patch.yaml b/apps/jupyter/notebook-controller/upstream/default/manager_auth_proxy_patch.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
+        image: quay.io/brancz/kube-rbac-proxy:v0.4.0
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

diff --git a/apps/profiles/upstream/base/kustomization.yaml b/apps/profiles/upstream/base/kustomization.yaml
@@ -12,7 +12,7 @@ patchesStrategicMerge:
 images:
 - name: docker.io/kubeflownotebookswg/profile-controller
   newName: docker.io/kubeflownotebookswg/profile-controller
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 
 configMapGenerator:
 - name: namespace-labels-data

diff --git a/apps/profiles/upstream/default/manager_auth_proxy_patch.yaml b/apps/profiles/upstream/default/manager_auth_proxy_patch.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
+        image: quay.io/brancz/kube-rbac-proxy:v0.11.0
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

diff --git a/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml b/apps/profiles/upstream/overlays/kubeflow/kustomization.yaml
@@ -29,4 +29,4 @@ vars:
 images:
 - name: docker.io/kubeflownotebookswg/kfam
   newName: docker.io/kubeflownotebookswg/kfam
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
diff --git a/apps/pvcviewer-controller/upstream/base/kustomization.yaml b/apps/pvcviewer-controller/upstream/base/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
 images:
 - name: docker.io/kubeflownotebookswg/pvcviewer-controller
   newName: docker.io/kubeflownotebookswg/pvcviewer-controller
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
diff --git a/apps/pvcviewer-controller/upstream/default/manager_auth_proxy_patch.yaml b/apps/pvcviewer-controller/upstream/default/manager_auth_proxy_patch.yaml
@@ -31,7 +31,7 @@ spec:
           capabilities:
             drop:
               - "ALL"
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
+        image: quay.io/brancz/kube-rbac-proxy:v0.13.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

diff --git a/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml b/apps/tensorboard/tensorboard-controller/upstream/base/kustomization.yaml
@@ -14,4 +14,4 @@ patchesStrategicMerge:
 images:
 - name: docker.io/kubeflownotebookswg/tensorboard-controller
   newName: docker.io/kubeflownotebookswg/tensorboard-controller
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
diff --git a/apps/tensorboard/tensorboard-controller/upstream/default/manager_auth_proxy_patch.yaml b/apps/tensorboard/tensorboard-controller/upstream/default/manager_auth_proxy_patch.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: kube-rbac-proxy
-          image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+          image: quay.io/brancz/kube-rbac-proxy:v0.8.0
           args:
             - "--secure-listen-address=0.0.0.0:8443"
             - "--upstream=http://127.0.0.1:8080/"

diff --git a/apps/tensorboard/tensorboards-web-app/upstream/base/deployment.yaml b/apps/tensorboard/tensorboards-web-app/upstream/base/deployment.yaml
@@ -20,4 +20,6 @@ spec:
           value: $(TWA_USERID_PREFIX)
         - name: APP_SECURE_COOKIES
           value: $(TWA_APP_SECURE_COOKIES)
+        - name: METRICS
+          value: $(TWA_APP_ENABLE_METRICS)
       serviceAccountName: service-account
diff --git 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: docker.io/kubeflownotebookswg/tensorboards-web-app
   newName: docker.io/kubeflownotebookswg/tensorboards-web-app
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:
@@ -64,3 +64,10 @@ vars:
     apiVersion: v1
     kind: ConfigMap
     name: parameters
+- name: TWA_APP_ENABLE_METRICS
+  fieldref:
+    fieldPath: data.TWA_APP_ENABLE_METRICS
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: parameters
diff --git a/apps/tensorboard/tensorboards-web-app/upstream/base/params.env b/apps/tensorboard/tensorboards-web-app/upstream/base/params.env
@@ -3,3 +3,4 @@ TWA_USERID_HEADER=kubeflow-userid
 TWA_USERID_PREFIX=
 TWA_PREFIX=/tensorboards
 TWA_APP_SECURE_COOKIES=true
+TWA_APP_ENABLE_METRICS=1
diff --git a/apps/volumes-web-app/upstream/base/deployment.yaml b/apps/volumes-web-app/upstream/base/deployment.yaml
@@ -22,6 +22,8 @@ spec:
           value: $(VWA_APP_SECURE_COOKIES)
         - name: VOLUME_VIEWER_IMAGE
           value: filebrowser/filebrowser:v2.25.0
+        - name: METRICS
+          value: $(VWA_APP_ENABLE_METRICS)
         volumeMounts: 
         - name: viewer-spec
           mountPath: /etc/config/viewer-spec.yaml

diff --git 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: docker.io/kubeflownotebookswg/volumes-web-app
   newName: docker.io/kubeflownotebookswg/volumes-web-app
-  newTag: v1.9.2
+  newTag: v1.10.0-rc.0
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:
@@ -67,3 +67,10 @@ vars:
     apiVersion: v1
     kind: ConfigMap
     name: parameters
+- name: VWA_APP_ENABLE_METRICS
+  fieldref:
+    fieldPath: data.VWA_APP_ENABLE_METRICS
+  objref:
+    apiVersion: v1
+    kind: ConfigMap
+    name: parameters
diff --git a/apps/volumes-web-app/upstream/base/params.env b/apps/volumes-web-app/upstream/base/params.env
@@ -3,3 +3,4 @@ VWA_USERID_HEADER=kubeflow-userid
 VWA_USERID_PREFIX=
 VWA_PREFIX=/volumes
 VWA_APP_SECURE_COOKIES=true
+VWA_APP_ENABLE_METRICS=1
diff --git a/hack/synchronize-kubeflow-manifests.sh b/hack/synchronize-kubeflow-manifests.sh
@@ -14,7 +14,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-COMMIT="v1.9.2" # You can use tags as well
+COMMIT="v1.10.0-rc.0" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-kubeflow}
 BRANCH=${BRANCH:=synchronize-kubeflow-kubeflow-manifests-${COMMIT?}}