Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 6cfd223

Browse files
authored
Merge branch 'main' into main
2 parents 261b26b + 6ceccbd commit 6cfd223

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: .github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This questions are the first thing we need to know to understand the context.
3737
<!-- What do you think went wrong? -->
3838

3939

40-
**NGINX Ingress controller version** (exec into the pod and run nginx-ingress-controller --version.):
40+
**NGINX Ingress controller version** (exec into the pod and run `/nginx-ingress-controller --version`):
4141
<!--
4242
POD_NAMESPACE=ingress-nginx
4343
POD_NAME=$(kubectl get pods -n $POD_NAMESPACE -l app.kubernetes.io/name=ingress-nginx --field-selector=status.phase=Running -o jsonpath='{.items[0].metadata.name}')

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
1616
github.com/ncabatoff/process-exporter v0.8.4
1717
github.com/onsi/ginkgo/v2 v2.21.0
18-
github.com/opencontainers/runc v1.2.1
18+
github.com/opencontainers/runc v1.2.2
1919
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2020
github.com/prometheus/client_golang v1.20.5
2121
github.com/prometheus/client_model v0.6.1

Diff for: go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
171171
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
172172
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
173173
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
174-
github.com/opencontainers/runc v1.2.1 h1:mQkmeFSUxqFaVmvIn1VQPeQIKpHFya5R07aJw0DKQa8=
175-
github.com/opencontainers/runc v1.2.1/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc=
174+
github.com/opencontainers/runc v1.2.2 h1:jTg3Vw2A5f0N9PoxFTEwUhvpANGaNPT3689Yfd/zaX0=
175+
github.com/opencontainers/runc v1.2.2/go.mod h1:/PXzF0h531HTMsYQnmxXkBD7YaGShm/2zcRB79dksUc=
176176
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
177177
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
178178
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=

0 commit comments

Comments
 (0)