From 0fb7f99e88aabba2ac6a0d8d3b5d7264617d0d12 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Thu, 28 Nov 2024 16:42:05 +0900 Subject: [PATCH] Refine the server-side apply installation args Signed-off-by: Yuki Iwai --- Makefile | 2 +- README.md | 4 ++-- scripts/gha/setup-training-operator.sh | 2 +- scripts/setup-training-operator.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 41de69bd07..5d662cacf4 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ docker-push: ## Push docker image with the manager. ##@ Deployment install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. - $(KUSTOMIZE) build manifests/base/crds | kubectl apply --server-side=true -f - + $(KUSTOMIZE) build manifests/base/crds | kubectl apply --server-side -f - uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. $(KUSTOMIZE) build manifests/base/crds | kubectl delete -f - diff --git a/README.md b/README.md index ee0b8b2319..681999e5f5 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,13 @@ for the detailed instructions on how to install Training Operator. Run the following command to install the latest stable release of the Training Operator control plane: `v1.8.0`. ```bash -kubectl apply --server-side=true -k "github.com/kubeflow/training-operator.git/manifests/overlays/standalone?ref=v1.8.0" +kubectl apply --server-side -k "github.com/kubeflow/training-operator.git/manifests/overlays/standalone?ref=v1.8.0" ``` Run the following command to install the latest changes of the Training Operator control plane: ```bash -kubectl apply --server-side=true -k "github.com/kubeflow/training-operator/manifests/overlays/standalone" +kubectl apply --server-side -k "github.com/kubeflow/training-operator/manifests/overlays/standalone" ``` ### Installing the Python SDK diff --git a/scripts/gha/setup-training-operator.sh b/scripts/gha/setup-training-operator.sh index 54d1cd4157..8f07c00ace 100755 --- a/scripts/gha/setup-training-operator.sh +++ b/scripts/gha/setup-training-operator.sh @@ -27,7 +27,7 @@ cd manifests/overlays/standalone kustomize edit set image kubeflow/training-operator=${TRAINING_CI_IMAGE} echo "Installing training operator manifests" -kustomize build . | kubectl apply --server-side=true -f - +kustomize build . | kubectl apply --server-side -f - if [ "${GANG_SCHEDULER_NAME}" = "scheduler-plugins" ]; then SCHEDULER_PLUGINS_VERSION=$(go list -m -f "{{.Version}}" sigs.k8s.io/scheduler-plugins) diff --git a/scripts/setup-training-operator.sh b/scripts/setup-training-operator.sh index f2ce48bcbb..a1cda80e68 100755 --- a/scripts/setup-training-operator.sh +++ b/scripts/setup-training-operator.sh @@ -37,7 +37,7 @@ cd manifests/overlays/standalone kustomize edit set image kubeflow/training-operator=${REGISTRY}:${VERSION} echo "Installing training operator manifests" -kustomize build . | kubectl apply --server-side=true -f - +kustomize build . | kubectl apply --server-side -f - TIMEOUT=30 until kubectl get pods -n kubeflow | grep training-operator | grep 1/1 || [[ $TIMEOUT -eq 1 ]]; do