Skip to content

Commit 9777319

Browse files
miledxzmiledxz
authored
Merge branch 'nginxinc:main' into test/add-runtime-manager-tests
2 parents 7f6d1bf + 8f5b9e6 commit 9777319

File tree

12 files changed

+32
-25
lines changed

12 files changed

+32
-25
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ updates:
1010
- "**/*"
1111
schedule:
1212
interval: daily
13+
groups:
14+
otel:
15+
patterns:
16+
- "go.opentelemetry.io/otel*"
17+
k8s.io:
18+
patterns:
19+
- "k8s.io/*"
1320

1421
- package-ecosystem: docker
1522
directories:

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
4747

4848
- name: Docker Buildx
49-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
49+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
5050
with:
5151
driver-opts: network=host
5252

5353
- name: Setup QEMU
54-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
54+
uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
5555
with:
5656
platforms: arm64
5757

@@ -113,7 +113,7 @@ jobs:
113113
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
114114

115115
- name: Build Docker Image
116-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
116+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
117117
with:
118118
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }}
119119
context: "."
@@ -160,7 +160,7 @@ jobs:
160160
if: always()
161161

162162
- name: Upload Scan Results
163-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
163+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
164164
continue-on-error: true
165165
with:
166166
name: scan-results-${{ inputs.image }}

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
token: ${{ secrets.CODECOV_TOKEN }}
9898

9999
- name: Upload Coverage Report
100-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
100+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
101101
with:
102102
name: cover-${{ github.run_id }}.html
103103
path: ${{ github.workspace }}/cover.html

‎.github/workflows/conformance.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
permissions:
2828
contents: write # needed for uploading release artifacts
2929
env:
30-
DOCKER_BUILD_NO_SUMMARY: true
30+
DOCKER_BUILD_SUMMARY: false
3131
steps:
3232
- name: Checkout Repository
3333
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -43,7 +43,7 @@ jobs:
4343
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
4444

4545
- name: Docker Buildx
46-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
46+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
4747

4848
- name: NGF Docker meta
4949
id: ngf-meta
@@ -88,7 +88,7 @@ jobs:
8888
TELEMETRY_ENDPOINT_INSECURE: "false"
8989

9090
- name: Build NGF Docker Image
91-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
91+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
9292
with:
9393
file: build/Dockerfile
9494
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -99,7 +99,7 @@ jobs:
9999
pull: true
100100

101101
- name: Build NGINX Docker Image
102-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
102+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
103103
with:
104104
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
105105
tags: ${{ steps.nginx-meta.outputs.tags }}
@@ -118,7 +118,7 @@ jobs:
118118
working-directory: ./tests
119119

120120
- name: Build Test Docker Image
121-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
121+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
122122
with:
123123
file: tests/conformance/Dockerfile
124124
tags: conformance-test-runner:${{ github.sha }}

‎.github/workflows/functional.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: Run Tests
2323
runs-on: ubuntu-22.04
2424
env:
25-
DOCKER_BUILD_NO_SUMMARY: true
25+
DOCKER_BUILD_SUMMARY: false
2626
steps:
2727
- name: Checkout Repository
2828
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -38,7 +38,7 @@ jobs:
3838
run: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
3939

4040
- name: Docker Buildx
41-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
41+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
4242

4343
- name: NGF Docker meta
4444
id: ngf-meta
@@ -76,7 +76,7 @@ jobs:
7676
TELEMETRY_ENDPOINT_INSECURE: "true"
7777

7878
- name: Build NGF Docker Image
79-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
79+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
8080
with:
8181
file: build/Dockerfile
8282
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -87,7 +87,7 @@ jobs:
8787
target: goreleaser
8888

8989
- name: Build NGINX Docker Image
90-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
90+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
9191
with:
9292
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
9393
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/helm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
3232

3333
- name: Docker Buildx
34-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
34+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
3535

3636
- name: NGF Docker meta
3737
id: ngf-meta
@@ -60,7 +60,7 @@ jobs:
6060
type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }}
6161
6262
- name: Build NGF Docker Image
63-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
63+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
6464
with:
6565
file: build/Dockerfile
6666
tags: ${{ steps.ngf-meta.outputs.tags }}
@@ -71,7 +71,7 @@ jobs:
7171
pull: true
7272

7373
- name: Build NGINX Docker Image
74-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
74+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7575
with:
7676
file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}}
7777
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/nfr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Docker Buildx
5959
if: ${{ inputs.nginx_plus == true }}
60-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
60+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
6161

6262
- name: NGINX Docker meta
6363
id: nginx-meta
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Build NGINX Plus Docker Image
9191
if: ${{ inputs.nginx_plus == true }}
92-
uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0
92+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
9393
with:
9494
file: build/Dockerfile.nginxplus
9595
tags: ${{ steps.nginx-meta.outputs.tags }}

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
55+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
5656
with:
5757
name: SARIF file
5858
path: results.sarif

‎apis/v1alpha1/observabilitypolicy_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type ObservabilityPolicySpec struct {
4545

4646
// TargetRefs identifies the API object(s) to apply the policy to.
4747
// Objects must be in the same namespace as the policy.
48-
// Support: HTTPRoute
48+
// Support: HTTPRoute, GRPCRoute.
4949
//
5050
// +kubebuilder:validation:MaxItems=16
5151
// +kubebuilder:validation:XValidation:message="TargetRef Kind must be: HTTPRoute or GRPCRoute",rule="(self.exists(t, t.kind=='HTTPRoute') || self.exists(t, t.kind=='GRPCRoute'))"

‎config/crd/bases/gateway.nginx.org_observabilitypolicies.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ spec:
5454
description: |-
5555
TargetRefs identifies the API object(s) to apply the policy to.
5656
Objects must be in the same namespace as the policy.
57-
Support: HTTPRoute
57+
Support: HTTPRoute, GRPCRoute.
5858
items:
5959
description: |-
6060
LocalPolicyTargetReference identifies an API object to apply a direct or

0 commit comments

Comments
 (0)