diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5cd99fe..97bd268 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,6 +38,7 @@ jobs: echo "azure_cli=$(grep azure_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT echo "scalr_cli=$(grep scalr_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT echo "python=$(grep python versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "azure_kubelogin=$(grep azure_kubelogin versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT - name: Build Docker image uses: docker/build-push-action@v6 @@ -49,6 +50,7 @@ jobs: AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} PYTHON_VERSION=${{ steps.versions.outputs.python }} + AZURE_KUBELOGIN_VERSION=${{ steps.versions.outputs.azure_kubelogin }} cache-from: type=registry,ref=scalr/runner:buildcache cache-to: type=registry,ref=scalr/runner:buildcache load: true @@ -65,3 +67,4 @@ jobs: docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'python --version' docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'pip --version' docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'pip install requests' + docker run --rm scalr/runner:sha-${{ github.sha }} -xc 'kubelogin --version' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9d35604..5d50f45 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -35,6 +35,7 @@ jobs: echo "azure_cli=$(grep azure_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT echo "scalr_cli=$(grep scalr_cli versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT echo "python=$(grep python versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT + echo "azure_kubelogin=$(grep azure_kubelogin versions | cut -d= -f2)" | tee -a $GITHUB_OUTPUT - name: Format Image Tag id: image_tag @@ -51,6 +52,7 @@ jobs: AZURE_CLI_VERSION=${{ steps.versions.outputs.azure_cli }} SCALR_CLI_VERSION=${{ steps.versions.outputs.scalr_cli }} PYTHON_VERSION=${{ steps.versions.outputs.python }} + AZURE_KUBELOGIN_VERSION=${{ steps.versions.outputs.azure_kubelogin }} platforms: linux/amd64,linux/arm64 cache-from: type=registry,ref=scalr/runner:buildcache cache-to: type=registry,ref=scalr/runner:buildcache diff --git a/Dockerfile b/Dockerfile index c63574a..3d78881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -139,6 +139,17 @@ RUN < /usr/local/bin/kubelogin + chmod a+x /usr/local/bin/kubelogin + # Cleanup + rm -f /tmp/kubelogin.zip +EOT + # Add the scalr user (optional; used when running the container with UID 1000). RUN useradd -u 1000 -m scalr diff --git a/versions b/versions index 9aa5d68..1318cd4 100644 --- a/versions +++ b/versions @@ -4,3 +4,4 @@ aws_cli=2.27.32 azure_cli=2.74.0 scalr_cli=0.17.1 python=3.13.3 +azure_kubelogin=v0.2.13