diff --git a/Makefile b/Makefile index 952feddb..83bcd572 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ BIN_PATH=$(PROJECT_DIR)/bin install: check-python check-gcloud install-kueuectl install-kjob pip-install .PHONY: install-dev -install-dev: check-python check-gcloud mkdir-bin install-kubectl install-kueuectl install-kjob pip-install install-pytest +install-dev: check-python check-gcloud mkdir-bin install-kueuectl install-kjob pip-install install-pytest .PHONY: pip-install pip-install: @@ -36,7 +36,7 @@ run-integrationtests: pytest src/xpk/core/tests/integration/ .PHONY: install-kjob -install-kjob: install-kubectl +install-kjob: docker build -f tools/Dockerfile-kjob -t $(KJOB_DOCKER_IMG) tools/ docker run -idt --name $(KJOB_DOCKER_CONTAINER) $(KJOB_DOCKER_IMG) docker cp $(KJOB_DOCKER_CONTAINER):/kjob/bin/kubectl-kjob $(BIN_PATH)/kubectl-kjob @@ -47,13 +47,8 @@ install-kjob: install-kubectl mkdir-bin: mkdir -p $(BIN_PATH) -.PHONY: install-kubectl -install-kubectl: mkdir-bin - gcloud components install kubectl - gcloud components install gke-gcloud-auth-plugin - .PHONY: install-kueuectl -install-kueuectl: install-kubectl +install-kueuectl: curl -Lo $(BIN_PATH)/kubectl-kueue $(KUEUECTL_URL) chmod +x $(BIN_PATH)/kubectl-kueue diff --git a/README.md b/README.md index 7fc13e18..fd680252 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ Following tools must be installed: - gcloud (install from [here](https://cloud.google.com/sdk/gcloud#download_and_install_the)) - Run `gcloud init` - [Authenticate](https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login) to Google Cloud +- kubectl (install from [here](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl) together with [required plugins](https://cloud.google.com/kubernetes-engine/docs/how-to/cluster-access-for-kubectl#install_plugin)) - docker ([installation instruction](https://docs.docker.com/engine/install/)) - Run `gcloud auth configure-docker` to ensure images can be uploaded to registry - make - please run below command. @@ -84,7 +85,6 @@ Following tools must be installed: apt-get -y install make ``` In addition, below dependencies will be installed with `make install` command: -- kubectl (install from [here](https://kubernetes.io/docs/tasks/tools/)) - kueuectl (install from [here](https://kueue.sigs.k8s.io/docs/reference/kubectl-kueue/installation/)) - kjob (installation instructions [here](https://github.com/kubernetes-sigs/kjob/blob/main/docs/installation.md))