Skip to content

Commit adbf838

Browse files
sjbermansjberman
authored
Merge branch 'main' into proposal/inference-extension
2 parents ad0f5a9 + 6d1c328 commit adbf838

File tree

9 files changed

+69
-17
lines changed

9 files changed

+69
-17
lines changed

‎.github/workflows/ci.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ defaults:
2929
run:
3030
shell: bash
3131

32-
env:
33-
GOPROXY: ${{ (github.repository_owner == 'nginx' && (inputs.is_production_release || github.event_name == 'push' && github.ref == 'refs/heads/main') && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_ENDPOINT)) || (github.repository_owner == 'nginx' && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_DEV_ENDPOINT) || 'direct') }}
34-
3532
concurrency:
3633
group: ${{ github.ref_name }}-ci
3734
cancel-in-progress: true
@@ -48,11 +45,27 @@ jobs:
4845
min_k8s_version: ${{ steps.vars.outputs.min_k8s_version }}
4946
k8s_latest: ${{ steps.vars.outputs.k8s_latest }}
5047
helm_changes: ${{ steps.filter.outputs.charts }}
48+
goproxy: ${{ steps.goproxy.outputs.goproxy }}
5149
steps:
5250
- name: Checkout Repository
5351
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5452
with:
5553
fetch-depth: 0
54+
- name: Configure GOPROXY
55+
id: goproxy
56+
run: |
57+
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
58+
echo "No Artifactory secrets available - using direct GOPROXY"
59+
GOPROXY_VALUE="direct"
60+
elif [[ "${{ inputs.is_production_release }}" == "true" ]] || [[ "${{ github.event_name }}" == "push" && "${{ github.ref }}" == "refs/heads/main" ]]; then
61+
echo "Production mode - using production Artifactory"
62+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_ENDPOINT }}"
63+
else
64+
echo "Development mode - using dev Artifactory"
65+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
66+
fi
67+
echo "goproxy=${GOPROXY_VALUE}" >> $GITHUB_OUTPUT
68+
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
5669
5770
- name: Setup Golang Environment
5871
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
@@ -92,6 +105,8 @@ jobs:
92105
name: Unit Tests
93106
runs-on: ubuntu-24.04
94107
needs: vars
108+
env:
109+
GOPROXY: ${{ needs.vars.outputs.goproxy }}
95110
steps:
96111
- name: Checkout Repository
97112
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -144,6 +159,8 @@ jobs:
144159
name: Build Binary
145160
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || (github.event_name == 'push' && github.ref == 'refs/heads/main')) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
146161
needs: [vars, unit-tests, njs-unit-tests]
162+
env:
163+
GOPROXY: ${{ needs.vars.outputs.goproxy }}
147164
permissions:
148165
contents: write # for goreleaser/goreleaser-action and lucacome/draft-release to create/update releases
149166
id-token: write # for goreleaser/goreleaser-action to sign artifacts
@@ -345,6 +362,8 @@ jobs:
345362
name: CEL Tests
346363
runs-on: ubuntu-24.04
347364
needs: vars
365+
env:
366+
GOPROXY: ${{ needs.vars.outputs.goproxy }}
348367
steps:
349368
- name: Checkout Repository
350369
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

‎.github/workflows/conformance.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ defaults:
2828
env:
2929
PLUS_USAGE_ENDPOINT: ${{ secrets.JWT_PLUS_REPORTING_ENDPOINT }}
3030
ENABLE_EXPERIMENTAL: ${{ inputs.enable-experimental }}
31-
GOPROXY: ${{ github.repository_owner == 'nginx' && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_DEV_ENDPOINT) || 'direct' }}
3231

3332
permissions:
3433
contents: read
@@ -48,6 +47,16 @@ jobs:
4847
with:
4948
fetch-depth: 0
5049

50+
- name: Configure GOPROXY
51+
id: goproxy
52+
run: |
53+
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
54+
GOPROXY_VALUE="direct"
55+
else
56+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
57+
fi
58+
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
59+
5160
- name: Setup Golang Environment
5261
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5362
with:

‎.github/workflows/functional.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ defaults:
1616

1717
env:
1818
PLUS_USAGE_ENDPOINT: ${{ secrets.JWT_PLUS_REPORTING_ENDPOINT }}
19-
GOPROXY: ${{ github.repository_owner == 'nginx' && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_DEV_ENDPOINT) || 'direct' }}
2019

2120
permissions:
2221
contents: read
@@ -34,6 +33,16 @@ jobs:
3433
with:
3534
fetch-depth: 0
3635

36+
- name: Configure GOPROXY
37+
id: goproxy
38+
run: |
39+
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
40+
GOPROXY_VALUE="direct"
41+
else
42+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
43+
fi
44+
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
45+
3746
- name: Setup Golang Environment
3847
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3948
with:

‎.github/workflows/lint.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ defaults:
1212
run:
1313
shell: bash
1414

15-
env:
16-
GOPROXY: ${{ github.repository_owner == 'nginx' && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_DEV_ENDPOINT) || 'direct' }}
17-
1815
concurrency:
1916
group: ${{ github.ref_name }}-lint
2017
cancel-in-progress: true
@@ -34,6 +31,16 @@ jobs:
3431
- name: Checkout Repository
3532
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3633

34+
- name: Configure GOPROXY
35+
id: goproxy
36+
run: |
37+
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
38+
GOPROXY_VALUE="direct"
39+
else
40+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
41+
fi
42+
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
43+
3744
- name: Setup Golang Environment
3845
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3946
with:

‎.github/workflows/renovate-build.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ defaults:
1111
run:
1212
shell: bash
1313

14-
env:
15-
GOPROXY: ${{ github.repository_owner == 'nginx' && format('https://{0}:{1}@{2}', secrets.ARTIFACTORY_USER, secrets.ARTIFACTORY_TOKEN, secrets.ARTIFACTORY_DEV_ENDPOINT) || 'direct' }}
16-
1714
concurrency:
1815
group: ${{ github.ref_name }}-renovate
1916
cancel-in-progress: true
@@ -53,6 +50,16 @@ jobs:
5350
with:
5451
ref: ${{ github.head_ref }}
5552

53+
- name: Configure GOPROXY
54+
id: goproxy
55+
run: |
56+
if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]]; then
57+
GOPROXY_VALUE="direct"
58+
else
59+
GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_DEV_ENDPOINT }}"
60+
fi
61+
echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
62+
5663
- name: Setup Golang Environment
5764
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5865
with:

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/gomega v1.38.2
1414
github.com/prometheus/client_golang v1.23.0
1515
github.com/spf13/cobra v1.10.1
16-
github.com/spf13/pflag v1.0.9
16+
github.com/spf13/pflag v1.0.10
1717
go.opentelemetry.io/otel v1.38.0
1818
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
1919
go.uber.org/zap v1.27.0

‎go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,9 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
191191
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
192192
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
193193
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
194-
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
195194
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
195+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
196+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
196197
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
197198
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
198199
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

‎tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.2
55
replace github.com/nginx/nginx-gateway-fabric/v2 => ../
66

77
require (
8-
github.com/nginx/nginx-gateway-fabric/v2 v2.1.0
8+
github.com/nginx/nginx-gateway-fabric/v2 v2.1.1
99
github.com/onsi/ginkgo/v2 v2.25.2
1010
github.com/onsi/gomega v1.38.2
1111
github.com/prometheus/client_golang v1.23.0
@@ -56,7 +56,7 @@ require (
5656
github.com/prometheus/client_model v0.6.2 // indirect
5757
github.com/prometheus/procfs v0.16.1 // indirect
5858
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
59-
github.com/spf13/pflag v1.0.9 // indirect
59+
github.com/spf13/pflag v1.0.10 // indirect
6060
github.com/stretchr/testify v1.11.1 // indirect
6161
github.com/x448/float16 v0.8.4 // indirect
6262
go.uber.org/automaxprocs v1.6.0 // indirect

‎tests/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR
119119
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
120120
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 h1:18kd+8ZUlt/ARXhljq+14TwAoKa61q6dX8jtwOf6DH8=
121121
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
122-
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
123-
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
122+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
123+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
124124
github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d h1:X4+kt6zM/OVO6gbJdAfJR60MGPsqCzbtXNnjoGqdfAs=
125125
github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU=
126126
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

0 commit comments

Comments
 (0)