Merge pull request #435 from AI-Hypercomputer/sudo-make-rm

Remove sudo requirement from make

Author: sharabiani

.github/workflows/build_tests.yaml

@@ -98,11 +98,11 @@ jobs:
           usr/local/bin/
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-${{ matrix.python-version }}-${{needs.set-variables.outputs.run-id}}
+        key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
         lookup-only: true
     - name: install dependencies
       if : steps.check-cache.outputs.cache-hit != 'true'
-      run: make install-lint && make install-dev
+      run: make install-lint && make install-dev && cp ./bin/kubectl-kueue /usr/local/bin/kubectl-kueue && cp ./bin/kubectl-kjob /usr/local/bin/kubectl-kjob
     - name: Cache dependencies
       if : steps.check-cache.outputs.cache-hit != 'true'
       uses: actions/cache/save@v3
@@ -112,7 +112,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-${{ matrix.python-version }}-${{needs.set-variables.outputs.run-id}}
+        key: xpk-deps-${{ matrix.python-version }}-${{github.run_id}}-${{github.run_attempt}}
   linter:
     needs: [install-dependencies, set-variables]
     concurrency: # We support one build or nightly test to run at a time currently.

.github/workflows/reusable_batch_tests.yaml

@@ -56,7 +56,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10
     - name: Install expect package
       run: sudo apt-get install expect

.github/workflows/reusable_cluster_create.yaml

@@ -59,7 +59,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10-
     - uses: 'google-github-actions/auth@v2'
       with:

.github/workflows/reusable_cluster_delete.yaml

@@ -55,7 +55,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10
     - name: Check xpk installation
       run: xpk --help

.github/workflows/reusable_cluster_private.yaml

@@ -67,7 +67,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10
     - name: Set Google Cloud CLI properties to a unused zone to verify --zone arg is passed properly in commands.
       run: |

.github/workflows/reusable_integration_tests.yaml

@@ -46,7 +46,7 @@ jobs:
             /usr/local/bin/kubectl-kjob
             ~/.cache/pip
             ${{env.pythonLocation}}
-          key: xpk-deps-3.10-${{inputs.run-id}}
+          key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
           restore-keys: xpk-deps-3.10
       - name: "Set auth cidr"
         run: echo "AUTH_CIDR=$(curl api.ipify.org)/32" >> $GITHUB_ENV

.github/workflows/reusable_lint_and_format.yml

@@ -43,7 +43,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-${{matrix.python-version}}-${{inputs.run-id}}
+        key: xpk-deps-${{matrix.python-version}}-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-${{matrix.python-version}}-
     - name: Run pylint
       run: make pylint

.github/workflows/reusable_storage_tests_by_type.yaml

@@ -108,7 +108,7 @@ jobs:
             /usr/local/bin/kubectl-kjob
             ~/.cache/pip
             ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10-
     - name: Verify xpk installation
       run: xpk --help

.github/workflows/reusable_unit_tests.yaml

@@ -37,7 +37,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10-
     # - name: Install dependecies
     #   run: make install-dev

.github/workflows/reusable_workload_tests.yaml

@@ -59,7 +59,7 @@ jobs:
           /usr/local/bin/kubectl-kjob
           ~/.cache/pip
           ${{env.pythonLocation}}
-        key: xpk-deps-3.10-${{inputs.run-id}}
+        key: xpk-deps-3.10-${{github.run_id}}-${{github.run_attempt}}
         restore-keys: xpk-deps-3.10-
     - name: Set Google Cloud CLI properties to a unused zone to verify --zone arg is passed properly in commands.
       run: |

Makefile

@@ -15,7 +15,6 @@ PROJECT_DIR := $(realpath $(shell dirname $(firstword $(MAKEFILE_LIST))))
 KJOB_DOCKER_IMG := xpk_kjob
 KJOB_DOCKER_CONTAINER := xpk_kjob_container
 BIN_PATH=$(PROJECT_DIR)/bin
-USR_BIN_PATH=/usr/local/bin
 
 .PHONY: install
 install: check-python check-gcloud install-gcloud-auth-plugin install-kueuectl install-kjobctl pip-install
@@ -46,7 +45,6 @@ mkdir-bin:
 install-kueuectl: mkdir-bin
 	curl -Lo $(BIN_PATH)/kubectl-kueue $(KUEUECTL_URL);
 	chmod +x $(BIN_PATH)/kubectl-kueue;
-	sudo mv -f $(BIN_PATH)/kubectl-kueue $(USR_BIN_PATH)/kubectl-kueue;
 
 .PHONY: install-kjobctl
 install-kjobctl: mkdir-bin
@@ -58,7 +56,6 @@ install-kjobctl: mkdir-bin
 	docker cp $(KJOB_DOCKER_CONTAINER):/kjob/bin/kubectl-kjob $(BIN_PATH)/kubectl-kjob;
 	docker rm -f $(KJOB_DOCKER_CONTAINER);
 	docker image rm $(KJOB_DOCKER_IMG);
-	sudo mv -f $(BIN_PATH)/kubectl-kjob $(USR_BIN_PATH)/kubectl-kjob;
 
 .PHONY: install-gcloud-auth-plugin
 install-gcloud-auth-plugin: