Skip to content

Commit 454439a

Browse files
adrianmoiseyadrianmoisey
authored
Merge branch 'main' into handle_path_types
2 parents 77643ce + 29513e8 commit 454439a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+220
-1272
lines changed

‎.github/workflows/ci.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ jobs:
202202
| gzip > docker.tar.gz
203203
204204
- name: cache
205-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
205+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
206206
with:
207207
name: docker.tar.gz
208208
path: docker.tar.gz
@@ -270,7 +270,7 @@ jobs:
270270

271271
strategy:
272272
matrix:
273-
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
273+
k8s: [v1.28.15, v1.29.12, v1.30.8, v1.31.4, v1.32.0]
274274

275275
steps:
276276
- name: Checkout code
@@ -301,7 +301,7 @@ jobs:
301301
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
302302
strategy:
303303
matrix:
304-
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
304+
k8s: [v1.28.15, v1.29.12, v1.30.8, v1.31.4, v1.32.0]
305305
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
306306
with:
307307
k8s-version: ${{ matrix.k8s }}
@@ -315,7 +315,7 @@ jobs:
315315
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
316316
strategy:
317317
matrix:
318-
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
318+
k8s: [v1.28.15, v1.29.12, v1.30.8, v1.31.4, v1.32.0]
319319
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
320320
with:
321321
k8s-version: ${{ matrix.k8s }}

‎.github/workflows/images.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
(needs.changes.outputs.kube-webhook-certgen == 'true')
136136
strategy:
137137
matrix:
138-
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
138+
k8s: [v1.28.15, v1.29.12, v1.30.8, v1.31.4, v1.32.0]
139139
steps:
140140
- name: Checkout
141141
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

‎.github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ jobs:
5151
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5252
# format to the repository Actions tab.
5353
- name: "Upload artifact"
54-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
54+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
5555
with:
5656
name: SARIF file
5757
path: results.sarif
5858
retention-days: 5
5959

6060
# Upload the results to GitHub's code scanning dashboard.
6161
- name: "Upload to code-scanning"
62-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
62+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/vulnerability-scans.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
# This step checks out a copy of your repository.
7777
- name: Upload SARIF file
78-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
78+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

‎.github/workflows/zz-tmpl-k8s-e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
make kind-e2e-test
5050
5151
- name: Upload e2e junit-reports ${{ inputs.variation }}
52-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
52+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
5353
if: success() || failure()
5454
with:
5555
name: e2e-test-reports-${{ inputs.k8s-version }}${{ inputs.variation }}

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ clean-chroot-image: ## Removes local image
110110

111111
.PHONY: build
112112
build: ## Build ingress controller, debug tool and pre-stop hook.
113-
E2E_IMAGE=golang:$(GO_VERSION)-alpine3.20 USE_SHELL=/bin/sh build/run-in-docker.sh \
113+
E2E_IMAGE=golang:$(GO_VERSION)-alpine3.21 USE_SHELL=/bin/sh build/run-in-docker.sh \
114114
MAC_OS=$(MAC_OS) \
115115
PKG=$(PKG) \
116116
ARCH=$(ARCH) \

‎NGINX_BASE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
registry.k8s.io/ingress-nginx/nginx:v1.0.0@sha256:11ee0d0e3d063f1468f9a82958d57fa0718614fe10b676941f4dea0aef091faf
1+
registry.k8s.io/ingress-nginx/nginx:v1.1.0@sha256:43e04f78d7544010e2e86918faae1d15091995b7ef6e522f53cf3035ad814567

‎OWNERS_ALIASES

-20
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
11
# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
22

33
aliases:
4-
sig-network-leads:
5-
- caseydavenport
6-
- dcbw
7-
- thockin
8-
9-
ingress-nginx-admins:
10-
- Gacko
11-
- strongjz
12-
134
ingress-nginx-maintainers:
145
- cpanato
156
- Gacko
16-
- puerco
177
- strongjz
188
- tao12345666333
199

2010
ingress-nginx-reviewers:
2111
- cpanato
2212
- Gacko
23-
- puerco
2413
- strongjz
2514
- tao12345666333
2615

27-
ingress-nginx-helm-maintainers:
28-
- ubergesundheit
29-
30-
ingress-nginx-helm-reviewers:
31-
- ubergesundheit
32-
3316
ingress-nginx-docs-maintainers:
3417
- longwuyuan
35-
36-
ingress-nginx-kube-webhook-certgen-reviewers:
37-
- invidian

‎build/run-in-docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function cleanup {
4444
}
4545
trap cleanup EXIT
4646

47-
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20241104-02a3933e@sha256:baf30e414c5657cc71f5bd1db502f0e0ee4ab721b6560340eff214935e96bef0}
47+
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20241224-68ed4e7b@sha256:871642296ebc0dd386f9a43b0cf2606028d757d6c4a2737d41180f02f8172823}
4848

4949
if [[ "$RUNTIME" == podman ]]; then
5050
# Podman does not support both tag and digest
@@ -82,7 +82,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
8282
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
8383
echo "FLAGS=$FLAGS"
8484
#go env
85-
go install -mod=mod github.com/onsi/ginkgo/v2/[email protected].0
85+
go install -mod=mod github.com/onsi/ginkgo/v2/[email protected].1
8686
find / -type f -name ginkgo 2>/dev/null
8787
which ginkgo
8888
/bin/bash -c "${FLAGS}"

‎charts/ingress-nginx/Chart.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ kubeVersion: '>=1.21.0-0'
1515
maintainers:
1616
- name: cpanato
1717
- name: Gacko
18-
- name: puerco
1918
- name: strongjz
2019
- name: tao12345666333
2120
name: ingress-nginx

‎charts/ingress-nginx/OWNERS

-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
22

3-
approvers:
4-
- ingress-nginx-helm-maintainers
5-
6-
reviewers:
7-
- ingress-nginx-helm-reviewers
8-
93
labels:
104
- area/helm

‎charts/ingress-nginx/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@ metadata:
270270
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
271271
| controller.admissionWebhooks.objectSelector | object | `{}` | |
272272
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
273-
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f"` | |
273+
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:aaafd456bda110628b2d4ca6296f38731a3aaf0bf7581efae824a41c770a8fc4"` | |
274274
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
275275
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
276-
| controller.admissionWebhooks.patch.image.tag | string | `"v1.4.4"` | |
276+
| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.0"` | |
277277
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
278278
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
279279
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |

‎charts/ingress-nginx/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -804,8 +804,8 @@ controller:
804804
## for backwards compatibility consider setting the full image url via the repository value below
805805
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
806806
## repository:
807-
tag: v1.4.4
808-
digest: sha256:a9f03b34a3cbfbb26d103a14046ab2c5130a80c3d69d526ff8063d2b37b9fd3f
807+
tag: v1.5.0
808+
digest: sha256:aaafd456bda110628b2d4ca6296f38731a3aaf0bf7581efae824a41c770a8fc4
809809
pullPolicy: IfNotPresent
810810
# -- Provide a priority class name to the webhook patching job
811811
##

‎cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ options:
22
# Ignore Prow provided substitutions.
33
substitution_option: ALLOW_LOOSE
44
steps:
5-
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241110-72bb0b1665
5+
- name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241217-ff46a068cd
66
env:
77
- REGISTRY=gcr.io/k8s-staging-ingress-nginx
88
- REPO_INFO=https://github.com/kubernetes/ingress-nginx

‎docs/examples/canary/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
spec:
3232
containers:
3333
- name: production
34-
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.0.1@sha256:1cec65aa768720290d05d65ab1c297ca46b39930e56bc9488259f9114fcd30e2
34+
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.0@sha256:0713ba47b3e4359b38ad53cd785c34b158e168a91636520a4a5e54cd500d8356
3535
ports:
3636
- containerPort: 80
3737
env:
@@ -97,7 +97,7 @@ spec:
9797
spec:
9898
containers:
9999
- name: canary
100-
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.0.1@sha256:1cec65aa768720290d05d65ab1c297ca46b39930e56bc9488259f9114fcd30e2
100+
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.0@sha256:0713ba47b3e4359b38ad53cd785c34b158e168a91636520a4a5e54cd500d8356
101101
ports:
102102
- containerPort: 80
103103
env:

‎docs/examples/customization/custom-errors/README.md

+21-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
This example demonstrates how to use a custom backend to render custom error pages.
44

5-
If you are using Helm Chart, look at [example values](https://github.com/kubernetes/ingress-nginx/blob/main/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml) and don't forget to add [configMap](https://github.com/kubernetes/ingress-nginx/blob/main/docs/examples/customization/custom-errors/custom-default-backend-error_pages.configMap.yaml) to your deployment, otherwise continue with [Customized default backend](#customized-default-backend) manual deployment.
5+
If you are using the Helm Chart, look at [example values](https://github.com/kubernetes/ingress-nginx/blob/main/docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml) and don't forget to add the [ConfigMap](https://github.com/kubernetes/ingress-nginx/blob/main/docs/examples/customization/custom-errors/custom-default-backend-error_pages.configMap.yaml) to your deployment. Otherwise, continue with [Customized default backend](#customized-default-backend) manual deployment.
66

77
## Customized default backend
88

9-
First, create the custom `default-backend`. It will be used by the Ingress controller later on.
9+
First, create the custom `default-backend`. It will be used by the Ingress controller later on.
10+
1011
To do that, you can take a look at the [example manifest](https://github.com/kubernetes/ingress-nginx/blob/main/docs/examples/customization/custom-errors/custom-default-backend.yaml)
1112
in this project's GitHub repository.
1213

@@ -38,11 +39,11 @@ If you do not already have an instance of the Ingress-Nginx Controller running,
3839
2. Edit the `ingress-nginx-controller` ConfigMap and create the key `custom-http-errors` with a value of `404,503`.
3940

4041
3. Take note of the IP address assigned to the Ingress-Nginx Controller Service.
41-
```
42-
$ kubectl get svc ingress-nginx
43-
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
44-
ingress-nginx ClusterIP 10.0.0.13 <none> 80/TCP,443/TCP 10m
45-
```
42+
```
43+
$ kubectl get svc ingress-nginx
44+
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
45+
ingress-nginx ClusterIP 10.0.0.13 <none> 80/TCP,443/TCP 10m
46+
```
4647

4748
!!! note
4849
The `ingress-nginx` Service is of type `ClusterIP` in this example. This may vary depending on your environment.
@@ -85,3 +86,16 @@ Vary: Accept-Encoding
8586

8687
To go further with this example, feel free to deploy your own applications and Ingress objects, and validate that the
8788
responses are still in the correct format when a backend returns 503 (eg. if you scale a Deployment down to 0 replica).
89+
90+
## Maintenance page
91+
92+
You can also leverage custom error pages to set a **"_Service under maintenance_" page** for the whole cluster, useful to prevent users from accessing your services while you are performing planned scheduled maintenance.
93+
94+
When enabled, the maintenance page is served to the clients with an HTTP [**503 Service Unavailable**](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/503) response **status code**.
95+
96+
To do that:
97+
98+
- Enable a **custom error page for the 503 HTTP error**, by following the guide above
99+
- Set the value of the `--watch-namespace-selector` flag to the name of some non-existent namespace, e.g. `nonexistent-namespace`
100+
- This effectively prevents the NGINX Ingress Controller from reading `Ingress` resources from any namespace in the Kubernetes cluster
101+
- Set your `location-snippet` to `return 503;`, to make the NGINX Ingress Controller always return the 503 HTTP error page for all the requests

‎docs/examples/customization/custom-errors/custom-default-backend.helm.values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ defaultBackend:
66
image:
77
registry: registry.k8s.io
88
image: ingress-nginx/custom-error-pages
9-
tag: v1.0.2@sha256:b2259cf6bfda813548a64bded551b1854cb600c4f095738b49b4c5cdf8ab9d21
9+
tag: v1.1.0@sha256:a2342e403fc3c19f81f5625e1b93daa0f8fb3dfaa1df4905f85e32d2d98a5e96
1010
extraVolumes:
1111
- name: custom-error-pages
1212
configMap:

‎docs/examples/customization/custom-errors/custom-default-backend.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
spec:
3737
containers:
3838
- name: nginx-error-server
39-
image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.0.2@sha256:b2259cf6bfda813548a64bded551b1854cb600c4f095738b49b4c5cdf8ab9d21
39+
image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.1.0@sha256:a2342e403fc3c19f81f5625e1b93daa0f8fb3dfaa1df4905f85e32d2d98a5e96
4040
ports:
4141
- containerPort: 8080
4242
# Setting the environment variable DEBUG we can see the headers sent

‎docs/examples/customization/external-auth-headers/echo-service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
terminationGracePeriodSeconds: 60
1919
containers:
2020
- name: echo-service
21-
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.0.1@sha256:1cec65aa768720290d05d65ab1c297ca46b39930e56bc9488259f9114fcd30e2
21+
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.1.0@sha256:0713ba47b3e4359b38ad53cd785c34b158e168a91636520a4a5e54cd500d8356
2222
ports:
2323
- containerPort: 8080
2424
resources:

‎docs/examples/customization/sysctl/patch.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"spec": {
55
"initContainers": [{
66
"name": "sysctl",
7-
"image": "alpine:3.20",
7+
"image": "alpine:3.21",
88
"securityContext": {
99
"privileged": true
1010
},

‎go.mod

+17-18
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/mitchellh/mapstructure v1.5.0
1515
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
1616
github.com/ncabatoff/process-exporter v0.8.4
17-
github.com/onsi/ginkgo/v2 v2.22.0
17+
github.com/onsi/ginkgo/v2 v2.22.1
1818
github.com/opencontainers/runc v1.2.3
1919
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
2020
github.com/prometheus/client_golang v1.20.5
@@ -27,18 +27,18 @@ require (
2727
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
2828
golang.org/x/crypto v0.31.0
2929
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
30-
google.golang.org/grpc v1.68.1
30+
google.golang.org/grpc v1.69.2
3131
google.golang.org/grpc/examples v0.0.0-20240223204917-5ccf176a08ab
3232
gopkg.in/go-playground/pool.v3 v3.1.1
3333
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
3434
k8s.io/api v0.32.0
35-
k8s.io/apiextensions-apiserver v0.31.3
35+
k8s.io/apiextensions-apiserver v0.32.0
3636
k8s.io/apimachinery v0.32.0
37-
k8s.io/apiserver v0.31.3
38-
k8s.io/cli-runtime v0.31.3
37+
k8s.io/apiserver v0.32.0
38+
k8s.io/cli-runtime v0.32.0
3939
k8s.io/client-go v0.32.0
40-
k8s.io/code-generator v0.31.3
41-
k8s.io/component-base v0.31.3
40+
k8s.io/code-generator v0.32.0
41+
k8s.io/component-base v0.32.0
4242
k8s.io/klog/v2 v2.130.1
4343
pault.ag/go/sniff v0.0.0-20200207005214-cf7e4d167732
4444
sigs.k8s.io/controller-runtime v0.19.3
@@ -51,6 +51,8 @@ require (
5151
github.com/klauspost/compress v1.17.9 // indirect
5252
github.com/moby/sys/userns v0.1.0 // indirect
5353
github.com/x448/float16 v0.8.4 // indirect
54+
go.opentelemetry.io/otel v1.31.0 // indirect
55+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
5456
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5557
sigs.k8s.io/release-utils v0.8.3 // indirect
5658
)
@@ -83,7 +85,7 @@ require (
8385
github.com/google/gnostic-models v0.6.8 // indirect
8486
github.com/google/go-cmp v0.6.0 // indirect
8587
github.com/google/gofuzz v1.2.0 // indirect
86-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
88+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
8789
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8890
github.com/google/uuid v1.6.0 // indirect
8991
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -111,29 +113,26 @@ require (
111113
github.com/xlab/treeprint v1.2.0 // indirect
112114
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
113115
github.com/yudai/pp v2.0.1+incompatible // indirect
114-
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
115-
go.uber.org/zap v1.27.0 // indirect
116-
golang.org/x/mod v0.21.0 // indirect
117-
golang.org/x/net v0.32.0 // indirect
116+
golang.org/x/mod v0.22.0 // indirect
117+
golang.org/x/net v0.33.0 // indirect
118118
golang.org/x/oauth2 v0.24.0 // indirect
119119
golang.org/x/sync v0.10.0 // indirect
120120
golang.org/x/sys v0.28.0 // indirect
121121
golang.org/x/term v0.27.0 // indirect
122122
golang.org/x/text v0.21.0 // indirect
123123
golang.org/x/time v0.7.0 // indirect
124-
golang.org/x/tools v0.26.0 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
124+
golang.org/x/tools v0.28.0 // indirect
125+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
126126
google.golang.org/protobuf v1.35.2 // indirect
127127
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
128128
gopkg.in/inf.v0 v0.9.1 // indirect
129-
gopkg.in/yaml.v2 v2.4.0 // indirect
130129
gopkg.in/yaml.v3 v3.0.1 // indirect
131-
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
130+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
132131
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
133132
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
134133
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
135-
sigs.k8s.io/kustomize/api v0.17.2 // indirect
136-
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
134+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
135+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
137136
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
138137
sigs.k8s.io/yaml v1.4.0 // indirect
139138
)

0 commit comments

Comments
 (0)