Update kserve models web application to 0.13.0 rc.0 (#2771)

* fix the scripts and update the kserve models web application Signed-off-by: juliusvonkohout <[email protected]> Update kserve models web application manifests from 0.13.0-rc.0 Signed-off-by: juliusvonkohout <[email protected]> Update kserve models web application manifests from 0.13.0-rc.0 Signed-off-by: juliusvonkohout <[email protected]> update scripts again Signed-off-by: juliusvonkohout <[email protected]> Revert "Update kserve models web application manifests from 0.13.0-rc.0" This reverts commit e68f23b. Signed-off-by: juliusvonkohout <[email protected]> Update kserve models web application manifests from 0.13.0-rc.0 Signed-off-by: juliusvonkohout <[email protected]> update scripts Signed-off-by: juliusvonkohout <[email protected]> update scripts Signed-off-by: juliusvonkohout <[email protected]> fix the names Signed-off-by: juliusvonkohout <[email protected]> update scripts Signed-off-by: juliusvonkohout <[email protected]> * fix the spelling Signed-off-by: juliusvonkohout <[email protected]> * fix the grammar and add back the istio-cni script Signed-off-by: juliusvonkohout <[email protected]> * revert some accidential changes Signed-off-by: juliusvonkohout <[email protected]> --------- Signed-off-by: juliusvonkohout <[email protected]>
kubeflow · Jun 28, 2024 · c99707f · c99707f
1 parent 787cb98
commit c99707f
Show file tree

Hide file tree

Showing 14 changed files with 114 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ This repo periodically syncs all official Kubeflow components from their respect
 | 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) |
 | 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 | [v0.10.0](https://github.com/kserve/models-web-app/tree/v0.10.0/config) |
+| 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) |
 | Kubeflow Pipelines | apps/pipeline/upstream | [2.2.0](https://github.com/kubeflow/pipelines/tree/2.2.0/manifests/kustomize) |
 | Kubeflow Tekton Pipelines | apps/kfp-tekton/upstream | [2.0.5](https://github.com/kubeflow/kfp-tekton/tree/2.0.5/manifests/kustomize) |
 | Kubeflow Model Registry | apps/model-registry/upstream | [v0.2.1-alpha](https://github.com/kubeflow/model-registry/tree/v0.2.1-alpha/manifests/kustomize) |

diff --git a/contrib/kserve/models-web-app/base/kustomization.yaml b/contrib/kserve/models-web-app/base/kustomization.yaml
@@ -13,7 +13,7 @@ commonLabels:
 images:
 - name: kserve/models-web-app
   newName: kserve/models-web-app
-  newTag: v0.10.0
+  newTag: v0.13.0-rc.0
 configMapGenerator:
   - name: kserve-models-web-app-config
     literals:

diff --git a/hack/sync-kserve-web-app-manifests.sh b/hack/sync-kserve-web-app-manifests.sh
diff --git a/hack/sync-istio-cni-manifests.sh → hack/synchronize-istio-cni-manifests.sh b/hack/sync-istio-cni-manifests.sh → hack/synchronize-istio-cni-manifests.sh
@@ -1,3 +1,4 @@
+@ -1,88 +0,0 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
@@ -77,9 +78,15 @@ if [ -n "$(git status --porcelain)" ]; then
   echo "WARNING: You have uncommitted changes"
 fi
 
-find "$MANIFESTS_DIR" -type f -not -path '*/.git/*' -exec sed -i "s/istio-cni-${CURRENT_VERSION}/istio-cni-${NEW_VERSION}/g" {} +
+# Update README.md to synchronize with the upgraded Istio version
+echo "Updating README..."
+SRC_TXT="\[.*\](https://github.com/istio/istio/releases/tag/.*)"
+DST_TXT="\[$COMMIT\](https://github.com/istio/istio/releases/tag/$COMMIT)"
 
+sed -i "s|$SRC_TXT|$DST_TXT|g" "${MANIFESTS_DIR}"/README.md
 
+#Synchronize the updated directory names with other files
+find "$MANIFESTS_DIR" -type f -not -path '*/.git/*' -exec sed -i "s/istio-cni-${CURRENT_VERSION}/istio-cni-${NEW_VERSION}/g" {} +
 
 echo "Committing the changes..."
 cd "$MANIFESTS_DIR"

diff --git a/hack/sync-istio-manifests.sh → hack/synchronize-istio-manifests.sh b/hack/sync-istio-manifests.sh → hack/synchronize-istio-manifests.sh
@@ -1,14 +1,13 @@
 # #!/usr/bin/env bash
 
-# # This script aims at helping create a PR to update the manifests of the
-# # knative.
+# # This script aims at helping create a PR to update the manifests of Istio
 # # This script:
 # # 1. Checks out a new branch
 # # 2. Download files into the correct places
 # # 3. Commits the changes
 # #
 # # Afterwards the developers can submit the PR to the kubeflow/manifests
-# # repo, based on that local branch
+# # repository, based on that local branch
 # # It must be executed directly from its directory
 
 # # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -77,14 +76,14 @@ if [ -n "$(git status --porcelain)" ]; then
   echo "WARNING: You have uncommitted changes"
 fi
 
-# Updating README.md to sync with Istio upgraded version
+# Update README.md to synchronize with the upgraded Istio version
 echo "Updating README..."
 SRC_TXT="\[.*\](https://github.com/istio/istio/releases/tag/.*)"
 DST_TXT="\[$COMMIT\](https://github.com/istio/istio/releases/tag/$COMMIT)"
 
 sed -i "s|$SRC_TXT|$DST_TXT|g" "${MANIFESTS_DIR}"/README.md
 
-#Syncing updated directory's name with other files
+#Synchronize the updated directory names with other files
 find "$MANIFESTS_DIR" -type f -not -path '*/.git/*' -exec sed -i "s/istio-${CURRENT_VERSION}/istio-${NEW_VERSION}/g" {} +
 
 echo "Committing the changes..."

diff --git a/hack/sync-katib-manifests.sh → hack/synchronize-katib-manifests.sh b/hack/sync-katib-manifests.sh → hack/synchronize-katib-manifests.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# kubeflow/katib repo.
+# kubeflow/katib repository.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -17,7 +17,7 @@ IFS=$'\n\t'
 
 COMMIT="v0.17.0-rc.0" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-katib}
-BRANCH=${BRANCH:=sync-kubeflow-katib-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-kubeflow-katib-manifests-${COMMIT?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)
@@ -40,7 +40,7 @@ else
 fi
 echo "Checking out in $SRC_DIR to $COMMIT..."
 
-# Checkout the KFP repository
+# Checkout the KFP repositorysitory
 mkdir -p $SRC_DIR
 cd $SRC_DIR
 if [ ! -d "katib/.git" ]; then

diff --git a/hack/sync-knative-manifests.sh → hack/synchronize-knative-manifests.sh b/hack/sync-knative-manifests.sh → hack/synchronize-knative-manifests.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 
-# This script aims at helping create a PR to update the manifests of the
-# knative.
+# This script aims at helping create a PR to update the manifests of knative.
 # This script:
 # 1. Checks out a new branch
 # 2. Download files into the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -18,7 +17,7 @@ IFS=$'\n\t'
 KN_SERVING_RELEASE="v1.12.4" # Must be a release
 KN_EXTENSION_RELEASE="v1.12.3" # Must be a release
 KN_EVENTING_RELEASE="v1.12.6" # Must be a release
-BRANCH=${BRANCH:=sync-knative-manifests-${KN_SERVING_RELEASE?}}
+BRANCH=${BRANCH:=synchronize-knative-manifests-${KN_SERVING_RELEASE?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)

diff --git a/hack/sync-kserve-kserve-manifests.sh → hack/synchronize-kserve-kserve-manifests.sh b/hack/sync-kserve-kserve-manifests.sh → hack/synchronize-kserve-kserve-manifests.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# kserve/kserve repo.
+# kserve/kserve repository.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -18,7 +18,7 @@ IFS=$'\n\t'
 KSERVE_VERSION="v0.13.0"
 COMMIT="0.13.0" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/kserve}
-BRANCH=${BRANCH:=sync-kserve-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-kserve-manifests-${COMMIT?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)

diff --git a/hack/synchronize-kserve-web-app-manifests.sh b/hack/synchronize-kserve-web-app-manifests.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+# This script aims at helping create a PR to update the manifests of the
+# kserve/models-web-app repository.
+# This script:
+# 1. Checks out a new branch
+# 2. Copies files to the correct places
+# 3. Commits the changes
+#
+# Afterwards the developers can submit the PR to the kubeflow/manifests
+# repository, based on that local branch
+
+
+COMMIT="0.13.0-rc.0" # You can use tags as well
+SRC_DIR=${SRC_DIR:=/tmp/kserve-models-web-app}
+BRANCH=${BRANCH:=synchronize-kserve-web-app-manifests-${COMMIT?}}
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+MANIFESTS_DIR=$(dirname $SCRIPT_DIR)
+
+echo "Creating branch: ${BRANCH}"
+
+if [ -n "$(git status --porcelain)" ]; then
+  echo "WARNING: You have uncommitted changes"
+fi
+
+if [ `git branch --list $BRANCH` ]
+then
+   echo "WARNING: Branch $BRANCH already exists."
+fi
+
+# 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 "models-web-app/.git" ]; then
+    git clone https://github.com/kserve/models-web-app.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
+  echo "WARNING: You have uncommitted changes"
+fi
+
+echo "Copying admission-webhook manifests..."
+DST_DIR=$MANIFESTS_DIR/contrib/kserve/models-web-app
+if [ -d "$DST_DIR" ]; then
+    rm -r "$DST_DIR"
+fi
+mkdir -p $DST_DIR
+cp $SRC_DIR/models-web-app/config/* $DST_DIR -r
+
+echo "Successfully copied all manifests."
+
+echo "Updating README..."
+SRC_TXT="\[.*\](https://github.com/kserve/models-web-app/tree/.*)"
+DST_TXT="\[$COMMIT\](https://github.com/kserve/models-web-app/tree/$COMMIT/config)"
+
+sed -i "s|$SRC_TXT|$DST_TXT|g" "${MANIFESTS_DIR}"/README.md
+
+echo "Committing the changes..."
+cd $MANIFESTS_DIR
+git add contrib/kserve/models-web-app
+git add README.md
+git commit -s -m "Update kserve models web application manifests from ${COMMIT}"
diff --git a/hack/sync-kubeflow-manifests.sh → hack/synchronize-kubeflow-manifests.sh b/hack/sync-kubeflow-manifests.sh → hack/synchronize-kubeflow-manifests.sh
@@ -15,7 +15,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-kubeflow}
-BRANCH=${BRANCH:=sync-kubeflow-kubeflow-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-kubeflow-kubeflow-manifests-${COMMIT?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)

diff --git a/hack/sync-model-registry-manifests.sh → hack/synchronize-model-registry-manifests.sh b/hack/sync-model-registry-manifests.sh → hack/synchronize-model-registry-manifests.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# kubeflow/model-registry repo.
+# kubeflow/model-registry repository.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -18,7 +18,7 @@ IFS=$'\n\t'
 COMMIT="v0.2.1-alpha" # You can use tags as well
 DEV_MODE=${DEV_MODE:=false}
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-model-registry}
-BRANCH=${BRANCH:=sync-kubeflow-model-registry-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-kubeflow-model-registry-manifests-${COMMIT?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)

diff --git a/hack/sync-pipelines-manifests.sh → hack/synchronize-pipelines-manifests.sh b/hack/sync-pipelines-manifests.sh → hack/synchronize-pipelines-manifests.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# kubeflow/pipelines repo.
+# kubeflow/pipelines repository.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -17,7 +17,7 @@ IFS=$'\n\t'
 
 COMMIT="2.2.0" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/kubeflow-pipelines}
-BRANCH=${BRANCH:=sync-kubeflow-pipelines-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-kubeflow-pipelines-manifests-${COMMIT?}}
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 MANIFESTS_DIR=$(dirname $SCRIPT_DIR)

diff --git a/hack/sync-seldon-manifests.sh → hack/synchronize-seldon-manifests.sh b/hack/sync-seldon-manifests.sh → hack/synchronize-seldon-manifests.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 # This script aims at helping create a PR to update the manifests of the
-# contrib/seldon repo.
+# contrib/seldon repository.
 # This script:
 # 1. Checks out a new branch
 # 2. Copies files to the correct places
 # 3. Commits the changes
 #
 # Afterwards the developers can submit the PR to the kubeflow/manifests
-# repo, based on that local branch
+# repository, based on that local branch
 # It must be executed directly from its directory
 
 # strict mode http://redsymbol.net/articles/unofficial-bash-strict-mode/
@@ -17,7 +17,7 @@ IFS=$'\n\t'
 
 COMMIT="v1.18.1" # You can use tags as well
 SRC_DIR=${SRC_DIR:=/tmp/seldon}
-BRANCH=${BRANCH:=sync-seldon-core-manifests-${COMMIT?}}
+BRANCH=${BRANCH:=synchronize-seldon-core-manifests-${COMMIT?}}
 UPDATE_ECHO_MODEL=false
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )