E58F Merge branch 'main' into moveServiceMonitor · nginx/kubernetes-ingress@7414ce6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7414ce6

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into moveServiceMonitor
2 parents dd12f90 + 372aeb9 commit 7414ce6

File tree

7 files changed

+180
-158
lines changed

7 files changed

+180
-158
lines changed

‎.github/workflows/build-oss.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
ignore-unfixed: "true"
162162

163163
- name: Upload Trivy scan results to GitHub Security tab
164-
uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
164+
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
165165
continue-on-error: true
166166
with:
167167
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

‎.github/workflows/build-plus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204
ignore-unfixed: "true"
205205

206206
- name: Upload Trivy scan results to GitHub Security tab
207-
uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
207+
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
208208
continue-on-error: true
209209
with:
210210
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
46+
uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -62,7 +62,7 @@ jobs:
6262
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6363
# If this step fails, then you should remove it and run the build manually (see below)
6464
- name: Autobuild
65-
uses: github/codeql-action/autobuild@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
65+
uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
6666

6767
# ℹ️ Command-line programs to run using the OS shell.
6868
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -75,6 +75,6 @@ jobs:
7575
# ./location_of_script_within_repo/buildscript.sh
7676

7777
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
78+
uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
7979
with:
8080
category: "/language:${{matrix.language}}"

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ jobs:
5454

5555
# Upload the results to GitHub's code scanning dashboard.
5656
- name: "Upload to code-scanning"
57-
uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
57+
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
5858
with:
5959
sarif_file: results.sarif

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ repos:
4848
args: [--new-from-patch=/tmp/diff.patch]
4949

5050
- repo: https://github.com/asottile/pyupgrade
51-
rev: v3.10.1
51+
rev: v3.11.0
5252
hooks:
5353
- id: pyupgrade
5454

@@ -72,7 +72,7 @@ repos:
7272
args: ['--schemafile', 'deployments/helm-chart/values.schema.json']
7373

7474
- repo: https://github.com/DavidAnson/markdownlint-cli2
75-
rev: v0.9.2
75+
rev: v0.10.0
7676
hooks:
7777
- id: markdownlint-cli2
7878

‎go.mod‎

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
module github.com/nginxinc/kubernetes-ingress
22

3-
go 1.21
3+
go 1.21.1
44

55
require (
6-
github.com/aws/aws-sdk-go-v2/config v1.18.35
7-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.15.5
8-
github.com/cert-manager/cert-manager v1.12.3
6+
github.com/aws/aws-sdk-go-v2/config v1.18.40
7+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.16.0
8+
github.com/cert-manager/cert-manager v1.13.0
99
github.com/go-chi/chi/v5 v5.0.10
1010
github.com/golang-jwt/jwt/v4 v4.5.0
11-
github.com/golang/glog v1.0.0
11+
github.com/golang/glog v1.1.0
1212
github.com/google/go-cmp v0.5.9
1313
github.com/kr/pretty v0.3.1
14-
github.com/nginxinc/nginx-plus-go-client v0.10.0
14+
github.com/nginxinc/nginx-plus-go-client v0.11.0
1515
github.com/nginxinc/nginx-prometheus-exporter v0.11.0
1616
github.com/nginxinc/nginx-service-mesh v1.7.0
1717
github.com/prometheus/client_golang v1.16.0
1818
github.com/spiffe/go-spiffe/v2 v2.1.6
1919
github.com/stretchr/testify v1.8.4
20-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
21-
k8s.io/api v0.28.0
22-
k8s.io/apimachinery v0.28.0
23-
k8s.io/client-go v0.28.0
24-
k8s.io/code-generator v0.28.0
25-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
20+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
21+
k8s.io/api v0.28.2
22+
k8s.io/apimachinery v0.28.2
23+
k8s.io/client-go v0.28.2
24+
k8s.io/code-generator v0.28.2
25+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2626
sigs.k8s.io/controller-tools v0.13.0
2727
)
2828

2929
require (
30-
github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
30+
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
3131
github.com/Microsoft/go-winio v0.6.0 // indirect
3232
github.com/aws/aws-sdk-go-v2 v1.21.0 // indirect
33-
github.com/aws/aws-sdk-go-v2/credentials v1.13.34 // indirect
34-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.10 // indirect
33+
github.com/aws/aws-sdk-go-v2/credentials v1.13.38 // indirect
34< C02E /td>+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11 // indirect
3535
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 // indirect
3636
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 // indirect
37-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.41 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.34 // indirect
39-
github.com/aws/aws-sdk-go-v2/service/sso v1.13.4 // indirect
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.4 // indirect
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.21.4 // indirect
37+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35 // indirect
39+
github.com/aws/aws-sdk-go-v2/service/sso v1.14.0 // indirect
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.16.0 // indirect
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.22.0 // indirect
4242
github.com/aws/smithy-go v1.14.2 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/blang/semver/v4 v4.0.0 // indirect
4545
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4646
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4747
github.com/coreos/go-semver v0.3.1 // indirect
4848
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
49-
github.com/davecgh/go-spew v1.1.1 // indirect
50-
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
49+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
50+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
5151
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5252
github.com/fatih/color v1.15.0 // indirect
5353
github.com/felixge/httpsnoop v1.0.3 // indirect
5454
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
5555
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
56-
github.com/go-ldap/ldap/v3 v3.4.4 // indirect
56+
github.com/go-ldap/ldap/v3 v3.4.5 // indirect
5757
github.com/go-logr/logr v1.2.4 // indirect
5858
github.com/go-logr/stdr v1.2.2 // indirect
5959
github.com/go-logr/zapr v1.2.4 // indirect
@@ -66,7 +66,7 @@ require (
6666
github.com/golang/protobuf v1.5.3 // indirect
6767
github.com/google/gnostic-models v0.6.8 // indirect
6868
github.com/google/gofuzz v1.2.0 // indirect
69-
github.com/google/uuid v1.3.0 // indirect
69+
github.com/google/uuid v1.3.1 // indirect
7070
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
7171
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
7272
github.com/imdario/mergo v0.3.13 // indirect
@@ -82,7 +82,7 @@ require (
8282
github.com/modern-go/reflect2 v1.0.2 // indirect
8383
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8484
github.com/pkg/errors v0.9.1 // indirect
85-
github.com/pmezard/go-difflib v1.0.0 // indirect
85+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8686
github.com/prometheus/client_model v0.4.0 // indirect
8787
github.com/prometheus/common v0.44.0 // indirect
8888
github.com/prometheus/procfs v0.10.1 // indirect
@@ -103,38 +103,37 @@ require (
103103
go.opentelemetry.io/otel/sdk v1.15.0 // indirect
104104
go.opentelemetry.io/otel/trace v1.15.0 // indirect
105105
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
106-
go.uber.org/atomic v1.10.0 // indirect
107106
go.uber.org/multierr v1.11.0 // indirect
108-
go.uber.org/zap v1.24.0 // indirect
109-
golang.org/x/crypto v0.12.0 // indirect
107+
go.uber.org/zap v1.25.0 // indirect
108+
golang.org/x/crypto v0.13.0 // indirect
110109
golang.org/x/mod v0.12.0 // indirect
111-
golang.org/x/net v0.14.0 // indirect
112-
golang.org/x/oauth2 v0.8.0 // indirect
113-
golang.org/x/sys v0.11.0 // indirect
114-
golang.org/x/term v0.11.0 // indirect
115-
golang.org/x/text v0.12.0 // indirect
110+
golang.org/x/net v0.15.0 // indirect
111+
golang.org/x/oauth2 v0.12.0 // indirect
112+
golang.org/x/sys v0.12.0 // indirect
113+
golang.org/x/term v0.12.0 // indirect
114+
golang.org/x/text v0.13.0 // indirect
116115
golang.org/x/time v0.3.0 // indirect
117-
golang.org/x/tools v0.12.0 // indirect
116+
golang.org/x/tools v0.13.0 // indirect
118117
google.golang.org/appengine v1.6.7 // indirect
119-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
120-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
121-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
122-
google.golang.org/grpc v1.54.0 // indirect
123-
google.golang.org/protobuf v1.30.0 // indirect
118+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
119+
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
121+
google.golang.org/grpc v1.57.0 // indirect
122+
google.golang.org/protobuf v1.31.0 // indirect
124123
gopkg.in/inf.v0 v0.9.1 // indirect
125124
gopkg.in/yaml.v2 v2.4.0 // indirect
126125
gopkg.in/yaml.v3 v3.0.1 // indirect
127-
k8s.io/apiextensions-apiserver v0.28.0 // indirect
128-
k8s.io/apiserver v0.28.0 // indirect
129-
k8s.io/component-base v0.28.0 // indirect
130-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
126+
k8s.io/apiextensions-apiserver v0.28.1 // indirect
127+
k8s.io/apiserver v0.28.1 // indirect
128+
k8s.io/component-base v0.28.1 // indirect
129+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
131130
k8s.io/klog/v2 v2.100.1 // indirect
132-
k8s.io/kube-aggregator v0.27.2 // indirect
133-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
131+
k8s.io/kube-aggregator v0.28.1 // indirect
132+
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
134133
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
135-
sigs.k8s.io/gateway-api v0.7.0 // indirect
134+
sigs.k8s.io/gateway-api v0.8.0 // indirect
136135
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
137-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
136+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
138137
sigs.k8s.io/yaml v1.3.0 // indirect
139138
)
140139

0 commit comments

Comments
 (0)
0