Update kubeflow/kubeflow manifests from v1.9.0-rc.1

Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Update kubeflow/kubeflow manifests from v1.9.0-rc.1 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> Update kubeflow/kubeflow manifests from v1.9.0-rc.1 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> fix the synchronization script Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com>
kubeflow · Jun 30, 2024 · 3f54830 · 3f54830
1 parent 60348d7
commit 3f54830
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -43,15 +43,15 @@ This repo periodically syncs all official Kubeflow components from their respect
 | Component | Local Manifests Path | Upstream Revision |
 | - | - | - |
 | Training Operator | apps/training-operator/upstream | [v1.8.0-rc.1](https://github.com/kubeflow/training-operator/tree/v1.8.0-rc.1/manifests) |
-| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/notebook-controller/config) |
-| PVC Viewer Controller | apps/pvcviewer-roller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/pvcviewer-controller/config) |
-| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/tensorboard-controller/config) |
-| Central Dashboard | apps/centraldashboard/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/centraldashboard/manifests) |
-| Profiles + KFAM | apps/profiles/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/profile-controller/config) |
-| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/admission-webhook/manifests) |
-| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/crud-web-apps/jupyter/manifests) |
-| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/crud-web-apps/tensorboards/manifests) |
-| Volumes Web App | apps/volumes-web-app/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/crud-web-apps/volumes/manifests) |
+| Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/notebook-controller/config) |
+| PVC Viewer Controller | apps/pvcviewer-roller/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/pvcviewer-controller/config) |
+| Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/tensorboard-controller/config) |
+| Central Dashboard | apps/centraldashboard/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/centraldashboard/manifests) |
+| Profiles + KFAM | apps/profiles/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/profile-controller/config) |
+| PodDefaults Webhook | apps/admission-webhook/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/admission-webhook/manifests) |
+| Jupyter Web App | apps/jupyter/jupyter-web-app/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/crud-web-apps/jupyter/manifests) |
+| Tensorboards Web App | apps/tensorboard/tensorboards-web-app/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/crud-web-apps/tensorboards/manifests) |
+| Volumes Web App | apps/volumes-web-app/upstream | [v1.9.0-rc.1](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.1/components/crud-web-apps/volumes/manifests) |
 | Katib | apps/katib/upstream | [v0.17.0-rc.0](https://github.com/kubeflow/katib/tree/v0.17.0-rc.0/manifests/v1beta1) |
 | KServe | contrib/kserve/kserve | [0.13.0](https://github.com/kserve/kserve/releases/tag/v0.13.0) |
 | KServe Models Web App | contrib/kserve/models-web-app | [0.13.0-rc.0](https://github.com/kserve/models-web-app/tree/0.13.0-rc.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.0-rc.0
+  newTag: latest
 namespace: kubeflow
 generatorOptions:
   disableNameSuffixHash: true

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.0-rc.0
+  newTag: latest
 configMapGenerator:
 - envs:
   - params.env

diff --git a/apps/centraldashboard/upstream/overlays/oauth2-proxy/kustomization.yaml b/apps/centraldashboard/upstream/overlays/oauth2-proxy/kustomization.yaml
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,15 +37,15 @@ spawnerFormDefaults:
   ################################################################
   image:
     # the default container image
-    value: kubeflownotebookswg/jupyter-scipy:v1.9.0-rc.0
+    value: kubeflownotebookswg/jupyter-scipy:latest
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/jupyter-scipy:v1.9.0-rc.0
-    - kubeflownotebookswg/jupyter-pytorch-full:v1.9.0-rc.0
-    - kubeflownotebookswg/jupyter-pytorch-cuda-full:v1.9.0-rc.0
-    - kubeflownotebookswg/jupyter-tensorflow-full:v1.9.0-rc.0
-    - kubeflownotebookswg/jupyter-tensorflow-cuda-full:v1.9.0-rc.0
+      - kubeflownotebookswg/jupyter-scipy:latest
+      - kubeflownotebookswg/jupyter-pytorch-full:latest
+      - kubeflownotebookswg/jupyter-pytorch-cuda-full:latest
+      - kubeflownotebookswg/jupyter-tensorflow-full:latest
+      - kubeflownotebookswg/jupyter-tensorflow-cuda-full:latest
 
   ################################################################
   # VSCode-like Container Images (Group 1)
@@ -60,11 +60,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupOne:
     # the default container image
-    value: kubeflownotebookswg/codeserver-python:v1.9.0-rc.0
+    value: kubeflownotebookswg/codeserver-python:latest
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/codeserver-python:v1.9.0-rc.0
+      - kubeflownotebookswg/codeserver-python:latest
 
   ################################################################
   # RStudio-like Container Images (Group 2)
@@ -81,11 +81,11 @@ spawnerFormDefaults:
   ################################################################
   imageGroupTwo:
     # the default container image
-    value: kubeflownotebookswg/rstudio-tidyverse:v1.9.0-rc.0
+    value: kubeflownotebookswg/rstudio-tidyverse:latest
 
     # the list of available container images in the dropdown
     options:
-    - kubeflownotebookswg/rstudio-tidyverse:v1.9.0-rc.0
+      - kubeflownotebookswg/rstudio-tidyverse:latest
 
   ################################################################
   # CPU Resources
@@ -130,10 +130,10 @@ spawnerFormDefaults:
       #  `limitsKey` - what will be set as the actual limit
       #  `uiName` - what will be displayed in the dropdown UI
       vendors:
-      - limitsKey: "nvidia.com/gpu"
-        uiName: "NVIDIA"
-      - limitsKey: "amd.com/gpu"
-        uiName: "AMD"
+        - limitsKey: "nvidia.com/gpu"
+          uiName: "NVIDIA"
+        - limitsKey: "amd.com/gpu"
+          uiName: "AMD"
 
       # the default value of the limit
       # (possible values: "none", "1", "2", "4", "8")
@@ -162,7 +162,7 @@ spawnerFormDefaults:
             requests:
               storage: 5Gi
           accessModes:
-          - ReadWriteOnce
+            - ReadWriteOnce
 
   ################################################################
   # Data Volumes

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.0-rc.0
+  newTag: latest
 # 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
@@ -5,4 +5,4 @@ resources:
 images:
 - name: docker.io/kubeflownotebookswg/notebook-controller
   newName: docker.io/kubeflownotebookswg/notebook-controller
-  newTag: v1.9.0-rc.0
+  newTag: latest
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.0-rc.0
+  newTag: latest
 
 configMapGenerator:
 - name: namespace-labels-data

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.0-rc.0
+  newTag: latest
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.0-rc.0
+  newTag: latest
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.0-rc.0
+  newTag: latest
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.0-rc.0
+  newTag: latest
 # 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
@@ -14,7 +14,7 @@ commonLabels:
 images:
 - name: docker.io/kubeflownotebookswg/volumes-web-app
   newName: docker.io/kubeflownotebookswg/volumes-web-app
-  newTag: v1.9.0-rc.0
+  newTag: latest
 # We need the name to be unique without the suffix because the original name is what
 # gets used with patches
 configMapGenerator:

diff --git a/hack/synchronize-kubeflow-manifests.sh b/hack/synchronize-kubeflow-manifests.sh
@@ -14,6 +14,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+COMMIT="v1.9.0-rc.1" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-kubeflow}
 BRANCH=${BRANCH:=synchronize-kubeflow-kubeflow-manifests-${COMMIT?}}
 
@@ -22,35 +23,47 @@ MANIFESTS_DIR=$(dirname $SCRIPT_DIR)
 
 echo "Creating branch: ${BRANCH}"
 
-# DEV: Comment out this if you are testing locally
 if [ -n "$(git status --porcelain)" ]; then
-  # Uncommitted changes
-  echo "WARNING: You have uncommitted changes, exiting..."
-  exit 1
+  echo "WARNING: You have uncommitted changes"
 fi
 
 if [ `git branch --list $BRANCH` ]
 then
-   echo "WARNING: Branch $BRANCH already exists. Exiting..."
-   exit 1
+   echo "WARNING: Branch $BRANCH already exists."
 fi
 
-# DEV: Comment out this checkout command if you are testing locally
-git checkout -b $BRANCH
-
+# Create the branch in the manifests repository
+if ! git show-ref --verify --quiet refs/heads/$BRANCH; then
+    git checkout -b $BRANCH
+else
+    echo "Branch $BRANCH already exists."
+fi
 echo "Checking out in $SRC_DIR to $COMMIT..."
+
+# Checkout the Model Registry repository
+mkdir -p $SRC_DIR
 cd $SRC_DIR
+if [ ! -d "kubeflow/.git" ]; then
+    git clone https://github.com/kubeflow/kubeflow.git
+fi
+cd $SRC_DIR/models-web-app
+if ! git rev-parse --verify --quiet $COMMIT; then
+    git checkout -b $COMMIT
+else
+    git checkout $COMMIT
+fi
+
 if [ -n "$(git status --porcelain)" ]; then
-  # Uncommitted changes
-  echo "WARNING: You have uncommitted changes, exiting..."
-  exit 1
+  echo "WARNING: You have uncommitted changes"
 fi
-git checkout $COMMIT
 
 echo "Copying admission-webhook manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/admission-webhook/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/admission-webhook/manifests $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/admission-webhook/manifests/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/admission-webhook/manifests)"
@@ -59,8 +72,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying centraldashboard manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/centraldashboard/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/centraldashboard/manifests $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/centraldashboard/manifests/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/centraldashboard/manifests)"
@@ -69,8 +85,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying jupyter-web-app manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/jupyter/jupyter-web-app/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/crud-web-apps/jupyter/manifests $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/crud-web-apps/jupyter/manifests/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/crud-web-apps/jupyter/manifests)"
@@ -79,8 +98,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying volumes-web-app manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/volumes-web-app/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/crud-web-apps/volumes/manifests $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/crud-web-apps/volumes/manifests/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/crud-web-apps/volumes/manifests)"
@@ -89,8 +111,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying tensorboards-web-app manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/tensorboard/tensorboards-web-app/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/crud-web-apps/tensorboards/manifests $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/crud-web-apps/tensorboards/manifests/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/crud-web-apps/tensorboards/manifests)"
@@ -99,8 +124,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying profile-controller manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/profiles/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/profile-controller/config $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/profile-controller/config/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/profile-controller/config)"
@@ -109,8 +137,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying notebook-controller manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/jupyter/notebook-controller/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/notebook-controller/config $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/notebook-controller/config/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/notebook-controller/config)"
@@ -119,8 +150,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying tensorboard-controller manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/tensorboard/tensorboard-controller/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/tensorboard-controller/config $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/tensorboard-controller/config/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/tensorboard-controller/config)"
@@ -129,8 +163,11 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Copying pvcviewer-controller manifests..."
 DST_DIR=$MANIFESTS_DIR/apps/pvcviewer-controller/upstream
-rm -r $DST_DIR
-cp $SRC_DIR/components/pvcviewer-controller/config $DST_DIR -r
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/kubeflow/components/pvcviewer-controller/config/* $DST_DIR -r
 
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/kubeflow/kubeflow/tree/.*/components/pvcviewer-controller/config)"
@@ -139,7 +176,6 @@ sed -i "s|$SRC_TXT|$DST_TXT|g" ${MANIFESTS_DIR}/README.md
 
 echo "Successfully copied all manifests."
 
-# DEV: Comment out these commands if you are testing locally
 echo "Committing the changes..."
 cd $MANIFESTS_DIR
 git add apps