Skip to content

Commit 09c2b3a

Browse files
mrajagopalmrajagopal
authored
Merge pull request #145 from nginx/areste-krew-changes
Modify krew bot config + project dependencies
2 parents 499f50b + 122d376 commit 09c2b3a

File tree

4 files changed

+296
-340
lines changed

4 files changed

+296
-340
lines changed

‎.github/workflows/release-builder.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Go
2828
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2929
with:
30-
go-version: '1.23.4'
30+
go-version: '1.24.3'
3131

3232
- name: Install Cosign
3333
uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2

‎.krew.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ spec:
99
matchLabels:
1010
os: linux
1111
arch: arm64
12-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_linux_arm64.tar.gz" .TagName }}
12+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_linux_arm64.tar.gz" .TagName }}
1313
bin: kubectl-nginx_supportpkg
1414
- selector:
1515
matchLabels:
1616
os: linux
1717
arch: amd64
18-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_linux_amd64.tar.gz" .TagName }}
18+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_linux_amd64.tar.gz" .TagName }}
1919
bin: kubectl-nginx_supportpkg
2020
- selector:
2121
matchLabels:
2222
os: darwin
2323
arch: arm64
24-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_darwin_arm64.tar.gz" .TagName}}
24+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_darwin_arm64.tar.gz" .TagName}}
2525
bin: kubectl-nginx_supportpkg
2626
- selector:
2727
matchLabels:
2828
os: darwin
2929
arch: amd64
30-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_darwin_amd64.tar.gz" .TagName }}
30+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_darwin_amd64.tar.gz" .TagName }}
3131
bin: kubectl-nginx_supportpkg
3232
- selector:
3333
matchLabels:
3434
os: windows
3535
arch: amd64
36-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_windows_amd64.tar.gz" .TagName }}
36+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_windows_amd64.tar.gz" .TagName }}
3737
bin: kubectl-nginx_supportpkg
3838
- selector:
3939
matchLabels:
4040
os: windows
4141
arch: arm64
42-
{{addURIAndSha "https://github.com/nginxinc/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_windows_arm64.tar.gz" .TagName }}
42+
{{addURIAndSha "https://github.com/nginx/nginx-supportpkg-for-k8s/releases/download/{{ .TagName }}/kubectl-nginx_supportpkg_{{ .TagName }}_windows_arm64.tar.gz" .TagName }}
4343
bin: kubectl-nginx_supportpkg
4444
shortDescription: Collect support packages for NGINX products that run on k8s
4545
homepage: https://github.com/nginxinc/nginx-supportpkg-for-k8s

‎go.mod‎

Lines changed: 73 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +1,140 @@
11
module github.com/nginxinc/nginx-k8s-supportpkg
22

3-
go 1.23.4
3+
go 1.24.3
44

55
require (
6-
github.com/mittwald/go-helm-client v0.12.16
7-
github.com/spf13/cobra v1.8.1
8-
k8s.io/client-go v0.32.3
6+
github.com/mittwald/go-helm-client v0.12.17
7+
github.com/spf13/cobra v1.9.1
8+
k8s.io/client-go v0.33.1
99
)
1010

1111
require (
12-
dario.cat/mergo v1.0.1 // indirect
13-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
14-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
15-
github.com/BurntSushi/toml v1.3.2 // indirect
12+
dario.cat/mergo v1.0.2 // indirect
13+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
14+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
15+
github.com/BurntSushi/toml v1.5.0 // indirect
1616
github.com/MakeNowJust/heredoc v1.0.0 // indirect
1717
github.com/Masterminds/goutils v1.1.1 // indirect
18-
github.com/Masterminds/semver/v3 v3.3.0 // indirect
18+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
1919
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
2020
github.com/Masterminds/squirrel v1.5.4 // indirect
2121
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
22-
github.com/beorn7/perks v1.0.1 // indirect
2322
github.com/blang/semver/v4 v4.0.0 // indirect
24-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
25-
github.com/chai2010/gettext-go v1.0.2 // indirect
26-
github.com/containerd/containerd v1.7.23 // indirect
27-
github.com/containerd/errdefs v0.3.0 // indirect
23+
github.com/chai2010/gettext-go v1.0.3 // indirect
24+
github.com/containerd/containerd v1.7.27 // indirect
25+
github.com/containerd/errdefs v1.0.0 // indirect
2826
github.com/containerd/log v0.1.0 // indirect
2927
github.com/containerd/platforms v0.2.1 // indirect
30-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
31-
github.com/distribution/reference v0.6.0 // indirect
32-
github.com/docker/cli v25.0.1+incompatible // indirect
33-
github.com/docker/distribution v2.8.3+incompatible // indirect
34-
github.com/docker/docker v26.1.5+incompatible // indirect
35-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
36-
github.com/docker/go-connections v0.5.0 // indirect
37-
github.com/docker/go-metrics v0.0.1 // indirect
38-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
28+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
29+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
30+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
3931
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
40-
github.com/fatih/color v1.16.0 // indirect
41-
github.com/felixge/httpsnoop v1.0.4 // indirect
42-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
32+
github.com/fatih/color v1.18.0 // indirect
33+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
4334
github.com/go-errors/errors v1.5.1 // indirect
4435
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
45-
github.com/go-logr/stdr v1.2.2 // indirect
4636
github.com/gobwas/glob v0.2.3 // indirect
47-
github.com/google/btree v1.1.2 // indirect
48-
github.com/google/go-cmp v0.6.0 // indirect
37+
github.com/google/btree v1.1.3 // indirect
38+
github.com/google/go-cmp v0.7.0 // indirect
4939
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
50-
github.com/gorilla/mux v1.8.1 // indirect
51-
github.com/gorilla/websocket v1.5.1 // indirect
40+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5241
github.com/gosuri/uitable v0.0.4 // indirect
5342
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
5443
github.com/hashicorp/errwrap v1.1.0 // indirect
5544
github.com/hashicorp/go-multierror v1.1.1 // indirect
5645
github.com/huandu/xstrings v1.5.0 // indirect
5746
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5847
github.com/jmoiron/sqlx v1.4.0 // indirect
59-
github.com/klauspost/compress v1.17.4 // indirect
48+
github.com/klauspost/compress v1.18.0 // indirect
6049
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
6150
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
6251
github.com/lib/pq v1.10.9 // indirect
6352
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
64-
github.com/mattn/go-colorable v0.1.13 // indirect
53+
github.com/mattn/go-colorable v0.1.14 // indirect
6554
github.com/mattn/go-isatty v0.0.20 // indirect
66-
github.com/mattn/go-runewidth v0.0.15 // indirect
55+
github.com/mattn/go-runewidth v0.0.16 // indirect
6756
github.com/mitchellh/copystructure v1.2.0 // indirect
6857
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6958
github.com/mitchellh/reflectwalk v1.0.2 // indirect
70-
github.com/moby/locker v1.0.1 // indirect
7159
github.com/moby/spdystream v0.5.0 // indirect
72-
github.com/moby/term v0.5.0 // indirect
60+
github.com/moby/term v0.5.2 // indirect
7361
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7462
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7563
github.com/opencontainers/go-digest v1.0.0 // indirect
76-
github.com/opencontainers/image-spec v1.1.0 // indirect
64+
github.com/opencontainers/image-spec v1.1.1 // indirect
7765
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7866
github.com/pkg/errors v0.9.1 // indirect
79-
github.com/prometheus/client_golang v1.19.1 // indirect
80-
github.com/prometheus/client_model v0.6.1 // indirect
81-
github.com/prometheus/common v0.55.0 // indirect
82-
github.com/prometheus/procfs v0.15.1 // indirect
83-
github.com/rivo/uniseg v0.4.4 // indirect
84-
github.com/rubenv/sql-migrate v1.7.0 // indirect
67+
github.com/prometheus/client_model v0.6.2 // indirect
68+
github.com/prometheus/common v0.64.0 // indirect
69+
github.com/prometheus/procfs v0.16.1 // indirect
70+
github.com/rivo/uniseg v0.4.7 // indirect
71+
github.com/rubenv/sql-migrate v1.8.0 // indirect
8572
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8673
github.com/shopspring/decimal v1.4.0 // indirect
8774
github.com/sirupsen/logrus v1.9.3 // indirect
88-
github.com/spf13/cast v1.7.0 // indirect
75+
github.com/spf13/cast v1.8.0 // indirect
8976
github.com/x448/float16 v0.8.4 // indirect
9077
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
9178
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
9279
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
9380
github.com/xlab/treeprint v1.2.0 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
95-
go.opentelemetry.io/otel v1.28.0 // indirect
96-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
97-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
98-
golang.org/x/crypto v0.35.0 // indirect
99-
golang.org/x/sync v0.11.0 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
101-
google.golang.org/grpc v1.65.0 // indirect
81+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
82+
go.opentelemetry.io/otel v1.36.0 // indirect
83+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
84+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
85+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
86+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
87+
golang.org/x/crypto v0.38.0 // indirect
88+
golang.org/x/sync v0.14.0 // indirect
89+
golang.org/x/tools v0.33.0 // indirect
90+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
91+
google.golang.org/grpc v1.72.1 // indirect
10292
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
103-
helm.sh/helm/v3 v3.16.4 // indirect
104-
k8s.io/apiserver v0.32.3 // indirect
105-
k8s.io/cli-runtime v0.32.0 // indirect
106-
k8s.io/component-base v0.32.3 // indirect
107-
k8s.io/kubectl v0.31.3 // indirect
108-
oras.land/oras-go v1.2.5 // indirect
109-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
110-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
93+
helm.sh/helm/v3 v3.18.0 // indirect
94+
k8s.io/apiserver v0.33.1 // indirect
95+
k8s.io/cli-runtime v0.33.1 // indirect
96+
k8s.io/component-base v0.33.1 // indirect
97+
k8s.io/kubectl v0.33.1 // indirect
98+
oras.land/oras-go/v2 v2.6.0 // indirect
99+
sigs.k8s.io/kustomize/api v0.19.0 // indirect
100+
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
101+
sigs.k8s.io/randfill v1.0.0 // indirect
111102
)
112103

113104
require (
114105
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
115-
github.com/emicklei/go-restful/v3 v3.11.1 // indirect
106+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
116107
github.com/go-logr/logr v1.4.2 // indirect
117-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
118-
github.com/go-openapi/jsonreference v0.20.4 // indirect
119-
github.com/go-openapi/swag v0.23.0 // indirect
108+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
109+
github.com/go-openapi/jsonreference v0.21.0 // indirect
110+
github.com/go-openapi/swag v0.23.1 // indirect
120111
github.com/gogo/protobuf v1.3.2 // indirect
121-
github.com/golang/protobuf v1.5.4 // indirect
122-
github.com/google/gnostic-models v0.6.8 // indirect
123-
github.com/google/gofuzz v1.2.0 // indirect
112+
github.com/google/gnostic-models v0.6.9 // indirect
124113
github.com/google/uuid v1.6.0 // indirect
125114
github.com/josharian/intern v1.0.0 // indirect
126115
github.com/json-iterator/go v1.1.12 // indirect
127-
github.com/mailru/easyjson v0.7.7 // indirect
116+
github.com/mailru/easyjson v0.9.0 // indirect
128117
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
129118
github.com/modern-go/reflect2 v1.0.2 // indirect
130119
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
131-
github.com/spf13/pflag v1.0.5 // indirect
132-
golang.org/x/net v0.36.0 // indirect
133-
golang.org/x/oauth2 v0.23.0 // indirect
134-
golang.org/x/sys v0.30.0 // indirect
135-
golang.org/x/term v0.29.0 // indirect
136-
golang.org/x/text v0.22.0 // indirect
137-
golang.org/x/time v0.7.0 // indirect
138-
google.golang.org/protobuf v1.35.1 // indirect
120+
github.com/spf13/pflag v1.0.6 // indirect
121+
golang.org/x/net v0.40.0 // indirect
122+
golang.org/x/oauth2 v0.30.0 // indirect
123+
golang.org/x/sys v0.33.0 // indirect
124+
golang.org/x/term v0.32.0 // indirect
125+
golang.org/x/text v0.25.0 // indirect
126+
golang.org/x/time v0.11.0 // indirect
127+
google.golang.org/protobuf v1.36.6 // indirect
139128
gopkg.in/inf.v0 v0.9.1 // indirect
140129
gopkg.in/yaml.v3 v3.0.1 // indirect
141-
k8s.io/api v0.32.3
142-
k8s.io/apiextensions-apiserver v0.32.3
143-
k8s.io/apimachinery v0.32.3
130+
k8s.io/api v0.33.1
131+
k8s.io/apiextensions-apiserver v0.33.1
132+
k8s.io/apimachinery v0.33.1
144133
k8s.io/klog/v2 v2.130.1 // indirect
145-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
146-
k8s.io/metrics v0.32.3
147-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
148-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
149-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
134+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
135+
k8s.io/metrics v0.33.1
136+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
137+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
138+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
150139
sigs.k8s.io/yaml v1.4.0 // indirect
151140
)

0 commit comments

Comments
 (0)