diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1c837a064..b73b68393 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -90,21 +90,12 @@ jobs: version: ${{ env.GOLANGCI_LINT_VERSION }} args: -v --timeout 5m skip-cache: true - - name: Setup JFrog CLI - id: jfrog - uses: jfrog/setup-jfrog-cli@v4 - env: - JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/ - with: - oidc-provider-name: nvgithub - oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + - name: Setup Go Proxy + id: setup-go-proxy + uses: nv-gha-runners/setup-artifactory-go-proxy@main - env: - OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }} - OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }} - OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }} run: | - OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))') - export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual" make check go-test: needs: [helm-lint, validate-csv, validate-helm-values] @@ -125,21 +116,12 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOLANG_VERSION }} - - name: Setup JFrog CLI - id: jfrog - uses: jfrog/setup-jfrog-cli@v4 - env: - JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/ - with: - oidc-provider-name: nvgithub - oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + - name: Setup Go Proxy + id: setup-go-proxy + uses: nv-gha-runners/setup-artifactory-go-proxy@main - env: - OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }} - OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }} - OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }} run: | - OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))') - export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual" make coverage go-build: needs: [helm-lint, validate-csv, validate-helm-values] @@ -169,22 +151,13 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ env.GOLANG_VERSION }} - - name: Setup JFrog CLI - id: jfrog - uses: jfrog/setup-jfrog-cli@v4 - env: - JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/ - with: - oidc-provider-name: nvgithub - oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + - name: Setup Go Proxy + id: setup-go-proxy + uses: nv-gha-runners/setup-artifactory-go-proxy@main - name: Generate coverage report env: - OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }} - OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }} - OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }} run: | - OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))') - export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual" make cov-report - name: Upload to Coveralls uses: coverallsapp/github-action@v2 @@ -230,24 +203,15 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Setup JFrog CLI - id: jfrog - uses: jfrog/setup-jfrog-cli@v4 - env: - JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/ - with: - oidc-provider-name: nvgithub - oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + - name: Setup Go Proxy + id: setup-go-proxy + uses: nv-gha-runners/setup-artifactory-go-proxy@main - name: Build image env: IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator VERSION: ${COMMIT_SHORT_SHA}-arm64 - OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }} - OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }} - OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }} run: | - OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))') - export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual" echo "${VERSION}" make build-image build-gpu-operator-amd64: @@ -287,24 +251,15 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Setup JFrog CLI - id: jfrog - uses: jfrog/setup-jfrog-cli@v4 - env: - JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/ - with: - oidc-provider-name: nvgithub - oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + - name: Setup Go Proxy + id: setup-go-proxy + uses: nv-gha-runners/setup-artifactory-go-proxy@main - name: Build image env: IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator VERSION: ${COMMIT_SHORT_SHA}-amd64 - OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }} - OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }} - OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }} + GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }} run: | - OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))') - export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual" echo "${VERSION}" make build-image diff --git a/Makefile b/Makefile index 021bb323a..90061e765 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ include $(CURDIR)/versions.mk MODULE := github.com/NVIDIA/gpu-operator BUILDER_IMAGE ?= golang:$(GOLANG_VERSION) -GOPROXY ?= direct +GOPROXY ?= https://proxy.golang.org,direct ifeq ($(IMAGE_NAME),) REGISTRY ?= nvcr.io/nvidia/cloud-native diff --git a/docker/Dockerfile b/docker/Dockerfile index fcba1cefb..0ea6d9f51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ FROM golang:1.25.1 AS builder -ARG GOPROXY=direct +ARG GOPROXY="https://proxy.golang.org,direct" ENV GOPROXY=$GOPROXY WORKDIR /workspace