Skip to content

Commit

Permalink
Use kubectl -k instead of kustomize (kubeflow#2634)
Browse files Browse the repository at this point in the history
* Use kubectl -k instead of kustomize

Signed-off-by: Dan Sun <dsun20@bloomberg.net>

* Pin fastapi to 0.88.0

Signed-off-by: Dan Sun <dsun20@bloomberg.net>

* Update make deploy-ci

Signed-off-by: Dan Sun <dsun20@bloomberg.net>

* Update make deploy-ci

Signed-off-by: Dan Sun <dsun20@bloomberg.net>

Signed-off-by: Dan Sun <dsun20@bloomberg.net>
  • Loading branch information
yuzisun committed Jan 8, 2023
1 parent 60dc5fa commit 9ac0565
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ deploy-dev-storageInitializer: docker-push-storageInitializer
kustomize build config/overlays/dev-image-config | kubectl apply -f -

deploy-ci: manifests
kustomize build config/overlays/test | kubectl apply -f -
kubectl apply -k config/overlays/test
# TODO: Add runtimes as part of default deployment
kubectl wait --for=condition=ready pod -l control-plane=kserve-controller-manager -n kserve --timeout=300s
kustomize build config/overlays/test/runtimes | kubectl apply -f -
kubectl apply -k config/overlays/test/runtimes

deploy-helm: manifests
helm install kserve-crd charts/kserve-crd/ --wait --timeout 180s
Expand Down
2 changes: 1 addition & 1 deletion python/kserve/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ protobuf~=3.19.0
prometheus-client>=0.13.1
orjson>=3.8.0
httpx>=0.23.0
fastapi>=0.85.0
fastapi>=0.85.0,<=0.88.0
uvicorn>=0.16.0
10 changes: 2 additions & 8 deletions test/scripts/gh-actions/setup-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,8 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null &&
ISTIO_VERSION="1.12.0"
KNATIVE_VERSION="knative-v1.4.0"
CERT_MANAGER_VERSION="v1.5.0"
KUSTOMIZE_VERSION="4.2.0"
YQ_VERSION="v4.28.1"

echo "Installing/Updating kustomize ..."
KUSTOMIZE_PATH=$(which kustomize)
rm -rf ${KUSTOMIZE_PATH}
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash -s -- ${KUSTOMIZE_VERSION} ${KUSTOMIZE_PATH::-10}

echo "Installing yq ..."
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/local/bin/yq && chmod +x /usr/local/bin/yq

Expand All @@ -47,7 +41,7 @@ pushd istio_tmp >/dev/null
popd

kubectl create ns istio-system
for i in 1 2 3 ; do kustomize build test/overlays/istio | kubectl apply -f - && break || sleep 15; done
for i in 1 2 3 ; do kubectl apply -k test/overlays/istio && break || sleep 15; done

echo "Waiting for Istio to be ready ..."
kubectl wait --for=condition=Ready pods --all --timeout=240s -n istio-system
Expand All @@ -72,7 +66,7 @@ pushd ${SCRIPT_DIR}/../../overlays/knative >/dev/null
sed -i 's/8443:/"8443":/g' release.yaml
popd

for i in 1 2 3 ; do kustomize build test/overlays/knative | kubectl apply -f - && break || sleep 15; done
for i in 1 2 3 ; do kubectl apply -k test/overlays/knative && break || sleep 15; done

echo "Waiting for Knative to be ready ..."
kubectl wait --for=condition=Ready pods --all --timeout=300s -n knative-serving -l 'app in (webhook, activator,autoscaler,autoscaler-hpa,controller,net-istio-controller,net-istio-webhook)'
Expand Down

0 comments on commit 9ac0565

Please sign in to comment.