Skip to content

Commit 4201e39

Browse files
tariq1890tariq1890
authored
Merge pull request #1750 from NVIDIA/jfrog-composite-action
use nv-gha-runners GH action for signing into JFrog artifactory
2 parents 58259cd + 69aa889 commit 4201e39

File tree

3 files changed

+22
-67
lines changed

3 files changed

+22
-67
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 20 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,12 @@ jobs:
9090
version: ${{ env.GOLANGCI_LINT_VERSION }}
9191
args: -v --timeout 5m
9292
skip-cache: true
93-
- name: Setup JFrog CLI
94-
id: jfrog
95-
uses: jfrog/setup-jfrog-cli@v4
96-
env:
97-
JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/
98-
with:
99-
oidc-provider-name: nvgithub
100-
oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
93+
- name: Setup Go Proxy
94+
id: setup-go-proxy
95+
uses: nv-gha-runners/setup-artifactory-go-proxy@main
10196
- env:
102-
OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
103-
OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }}
104-
OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
97+
GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
10598
run: |
106-
OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))')
107-
export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual"
10899
make check
109100
go-test:
110101
needs: [helm-lint, validate-csv, validate-helm-values]
@@ -125,21 +116,12 @@ jobs:
125116
uses: actions/setup-go@v5
126117
with:
127118
go-version: ${{ env.GOLANG_VERSION }}
128-
- name: Setup JFrog CLI
129-
id: jfrog
130-
uses: jfrog/setup-jfrog-cli@v4
131-
env:
132-
JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/
133-
with:
134-
oidc-provider-name: nvgithub
135-
oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
119+
- name: Setup Go Proxy
120+
id: setup-go-proxy
121+
uses: nv-gha-runners/setup-artifactory-go-proxy@main
136122
- env:
137-
OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
138-
OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }}
139-
OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
123+
GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
140124
run: |
141-
OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))')
142-
export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual"
143125
make coverage
144126
go-build:
145127
needs: [helm-lint, validate-csv, validate-helm-values]
@@ -169,22 +151,13 @@ jobs:
169151
uses: actions/setup-go@v5
170152
with:
171153
go-version: ${{ env.GOLANG_VERSION }}
172-
- name: Setup JFrog CLI
173-
id: jfrog
174-
uses: jfrog/setup-jfrog-cli@v4
175-
env:
176-
JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/
177-
with:
178-
oidc-provider-name: nvgithub
179-
oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
154+
- name: Setup Go Proxy
155+
id: setup-go-proxy
156+
uses: nv-gha-runners/setup-artifactory-go-proxy@main
180157
- name: Generate coverage report
181158
env:
182-
OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
183-
OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }}
184-
OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
159+
GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
185160
run: |
186-
OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))')
187-
export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual"
188161
make cov-report
189162
- name: Upload to Coveralls
190163
uses: coverallsapp/github-action@v2
@@ -230,24 +203,15 @@ jobs:
230203
registry: ghcr.io
231204
username: ${{ github.actor }}
232205
password: ${{ secrets.GITHUB_TOKEN }}
233-
- name: Setup JFrog CLI
234-
id: jfrog
235-
uses: jfrog/setup-jfrog-cli@v4
236-
env:
237-
JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/
238-
with:
239-
oidc-provider-name: nvgithub
240-
oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
206+
- name: Setup Go Proxy
207+
id: setup-go-proxy
208+
uses: nv-gha-runners/setup-artifactory-go-proxy@main
241209
- name: Build image
242210
env:
243211
IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator
244212
VERSION: ${COMMIT_SHORT_SHA}-arm64
245-
OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
246-
OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }}
247-
OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
213+
GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
248214
run: |
249-
OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))')
250-
export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual"
251215
echo "${VERSION}"
252216
make build-image
253217
build-gpu-operator-amd64:
@@ -287,24 +251,15 @@ jobs:
287251
registry: ghcr.io
288252
username: ${{ github.actor }}
289253
password: ${{ secrets.GITHUB_TOKEN }}
290-
- name: Setup JFrog CLI
291-
id: jfrog
292-
uses: jfrog/setup-jfrog-cli@v4
293-
env:
294-
JF_URL: https://${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}/
295-
with:
296-
oidc-provider-name: nvgithub
297-
oidc-audience: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
254+
- name: Setup Go Proxy
255+
id: setup-go-proxy
256+
uses: nv-gha-runners/setup-artifactory-go-proxy@main
298257
- name: Build image
299258
env:
300259
IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/gpu-operator
301260
VERSION: ${COMMIT_SHORT_SHA}-amd64
302-
OIDC_USER: ${{ steps.jfrog.outputs.oidc-user }}
303-
OIDC_TOKEN: ${{ steps.jfrog.outputs.oidc-token }}
304-
OIDC_ARTIFACTORY_ENDPOINT: ${{ secrets.OIDC_ARTIFACTORY_ENDPOINT }}
261+
GOPROXY: ${{ steps.setup-go-proxy.outputs.goproxy-url }}
305262
run: |
306-
OIDC_USER_ENCODED=$(python3 -c 'import urllib.parse, os; print(urllib.parse.quote_plus(os.environ["OIDC_USER"]))')
307-
export GOPROXY="https://${OIDC_USER_ENCODED}:${OIDC_TOKEN}@${OIDC_ARTIFACTORY_ENDPOINT}/artifactory/api/go/edge-go-remote-virtual"
308263
echo "${VERSION}"
309264
make build-image
310265

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ include $(CURDIR)/versions.mk
2626

2727
MODULE := github.com/NVIDIA/gpu-operator
2828
BUILDER_IMAGE ?= golang:$(GOLANG_VERSION)
29-
GOPROXY ?= direct
29+
GOPROXY ?= https://proxy.golang.org,direct
3030

3131
ifeq ($(IMAGE_NAME),)
3232
REGISTRY ?= nvcr.io/nvidia/cloud-native

‎docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
FROM golang:1.25.1 AS builder
1616

17-
ARG GOPROXY=direct
17+
ARG GOPROXY="https://proxy.golang.org,direct"
1818
ENV GOPROXY=$GOPROXY
1919

2020
WORKDIR /workspace

0 commit comments

Comments
 (0)