diff --git a/.github/workflows/build_tests.yaml b/.github/workflows/build_tests.yaml index 30be9873..90dbc6e7 100644 --- a/.github/workflows/build_tests.yaml +++ b/.github/workflows/build_tests.yaml @@ -54,6 +54,10 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.10' + - uses: google-github-actions/setup-gcloud@v2 + with: + version: '>= 363.0.0' + install_components: 'beta, gke-gcloud-auth-plugin' - name: Install dependencies run : make install-dev - name: Run unit tests @@ -76,7 +80,7 @@ jobs: - uses: google-github-actions/setup-gcloud@v2 with: version: '>= 363.0.0' - install_components: 'beta,gke-gcloud-auth-plugin' + install_components: 'beta,gke-gcloud-auth-plugin, gke-gcloud-auth-plugin' - name: Verify gcp setup run: gcloud info - name: Install dependencies diff --git a/Makefile b/Makefile index a77c2258..bdce6d14 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ mkdir-bin: .PHONY: install-kubectl install-kubectl: mkdir-bin - curl -Lo $(BIN_PATH)/kubectl $(KUBECTL_URL) - chmod +x $(BIN_PATH)/kubectl + sudo apt-get install kubectl + gcloud components install gke-gcloud-auth-plugin .PHONY: install-kueuectl install-kueuectl: install-kubectl diff --git a/README.md b/README.md index 6bc6e216..7fc13e18 100644 --- a/README.md +++ b/README.md @@ -70,21 +70,24 @@ and the following CPU types: Following tools must be installed: - python >= 3.10 (download from [here](https://www.python.org/downloads/)) -- gcloud (install from [here](https://cloud.google.com/sdk/gcloud#download_and_install_the)) -- docker ([installation instruction](https://docs.docker.com/engine/install/)) - pip ([installation instruction](https://pip.pypa.io/en/stable/installation/)) - python venv ([installation instruction](https://virtualenv.pypa.io/en/latest/installation.html)) +(all three of above can be installed at once from [here](https://packaging.python.org/en/latest/guides/installing-using-linux-tools/#installing-pip-setuptools-wheel-with-linux-package-managers)) +- 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 +- 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. ```shell -#sudo may be required -apt install make +# sudo may be required +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)) - # Installation To install xpk, run the following command and install additional tools, mentioned in [prerequisites](#prerequisites). [Makefile](https://github.com/AI-Hypercomputer/xpk/blob/main/Makefile) provides a way to install all neccessary tools: