Skip to content

Commit 98a5ca5

Browse files
mrajagopalmrajagopal
committed
Merge branch 'main' into mrajagopal-utils-pod
2 parents b39b200 + bdb3256 commit 98a5ca5

File tree

5 files changed

+238
-271
lines changed

5 files changed

+238
-271
lines changed

‎.github/workflows/fossa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
if: ${{ github.event.repository.fork == false }}
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626

2727
- name: Scan
28-
uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0
28+
uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
2929
with:
3030
api-key: ${{ secrets.FOSSA_TOKEN }}

‎.github/workflows/release-builder.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ jobs:
1919

2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Set Release Version
2525
run: echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
2626

2727
- name: Set up Go
28-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
28+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
2929
with:
30-
go-version: '1.22.4'
30+
go-version: '1.23.4'
3131

3232
- name: Install Cosign
33-
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
33+
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
3434
with:
3535
cosign-release: 'v2.4.0'
3636

@@ -68,4 +68,4 @@ jobs:
6868
asset_paths: '["./release/*.gz", "./release/*.txt", "./release/*.sig", "./release/*.pem"]'
6969

7070
- name: Update new version in krew-index
71-
uses: rajatjindal/krew-release-bot@df3eb197549e3568be8b4767eec31c5e8e8e6ad8 # v0.0.46
71+
uses: rajatjindal/krew-release-bot@3d9faef30a82761d610544f62afddca00993eef9 # v0.0.47

‎.github/workflows/scorecards.yml

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

2626
steps:
2727
- name: "Checkout code"
28-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
persist-credentials: false
3131

@@ -48,14 +48,14 @@ jobs:
4848
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4949
# format to the repository Actions tab.
5050
- name: "Upload artifact"
51-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
51+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
5252
with:
5353
name: SARIF file
5454
path: results.sarif
5555
retention-days: 5
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: "Upload to code-scanning"
59-
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
59+
uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
6060
with:
6161
sarif_file: results.sarif

‎go.mod

Lines changed: 64 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
11
module github.com/nginxinc/nginx-k8s-supportpkg
22

3-
go 1.22.4
3+
go 1.23.4
44

55
require (
6-
github.com/mittwald/go-helm-client v0.12.10
6+
github.com/mittwald/go-helm-client v0.12.16
77
github.com/spf13/cobra v1.8.1
8-
k8s.io/client-go v0.30.3
8+
k8s.io/client-go v0.32.3
99
)
1010

1111
require (
12+
dario.cat/mergo v1.0.1 // indirect
1213
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
1314
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1415
github.com/BurntSushi/toml v1.3.2 // indirect
1516
github.com/MakeNowJust/heredoc v1.0.0 // indirect
1617
github.com/Masterminds/goutils v1.1.1 // indirect
17-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
18-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
18+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
19+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
1920
github.com/Masterminds/squirrel v1.5.4 // indirect
20-
github.com/Microsoft/hcsshim v0.11.4 // indirect
2121
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/blang/semver/v4 v4.0.0 // indirect
24+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2425
github.com/chai2010/gettext-go v1.0.2 // indirect
25-
github.com/containerd/containerd v1.7.12 // indirect
26+
github.com/containerd/containerd v1.7.23 // indirect
27+
github.com/containerd/errdefs v0.3.0 // indirect
2628
github.com/containerd/log v0.1.0 // indirect
27-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
28-
github.com/distribution/reference v0.5.0 // indirect
29+
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
2932
github.com/docker/cli v25.0.1+incompatible // indirect
3033
github.com/docker/distribution v2.8.3+incompatible // indirect
3134
github.com/docker/docker v26.1.5+incompatible // indirect
3235
github.com/docker/docker-credential-helpers v0.8.0 // indirect
3336
github.com/docker/go-connections v0.5.0 // indirect
3437
github.com/docker/go-metrics v0.0.1 // indirect
35-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
38+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
3639
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
3740
github.com/fatih/color v1.16.0 // indirect
3841
github.com/felixge/httpsnoop v1.0.4 // indirect
42+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3943
github.com/go-errors/errors v1.5.1 // indirect
4044
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
4145
github.com/go-logr/stdr v1.2.2 // indirect
@@ -49,9 +53,9 @@ require (
4953
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
5054
github.com/hashicorp/errwrap v1.1.0 // indirect
5155
github.com/hashicorp/go-multierror v1.1.1 // indirect
52-
github.com/huandu/xstrings v1.4.0 // indirect
56+
github.com/huandu/xstrings v1.5.0 // indirect
5357
github.com/inconshreveable/mousetrap v1.1.0 // indirect
54-
github.com/jmoiron/sqlx v1.3.5 // indirect
58+
github.com/jmoiron/sqlx v1.4.0 // indirect
5559
github.com/klauspost/compress v1.17.4 // indirect
5660
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
5761
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -60,93 +64,88 @@ require (
6064
github.com/mattn/go-colorable v0.1.13 // indirect
6165
github.com/mattn/go-isatty v0.0.20 // indirect
6266
github.com/mattn/go-runewidth v0.0.15 // indirect
63-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
6467
github.com/mitchellh/copystructure v1.2.0 // indirect
6568
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6669
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6770
github.com/moby/locker v1.0.1 // indirect
68-
github.com/moby/spdystream v0.2.0 // indirect
71+
github.com/moby/spdystream v0.5.0 // indirect
6972
github.com/moby/term v0.5.0 // indirect
7073
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7174
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7275
github.com/opencontainers/go-digest v1.0.0 // indirect
73-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
76+
github.com/opencontainers/image-spec v1.1.0 // indirect
7477
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7578
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_golang v1.18.0 // indirect
77-
github.com/prometheus/client_model v0.5.0 // indirect
78-
github.com/prometheus/common v0.45.0 // indirect
79-
github.com/prometheus/procfs v0.12.0 // 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
8083
github.com/rivo/uniseg v0.4.4 // indirect
81-
github.com/rubenv/sql-migrate v1.6.0 // indirect
84+
github.com/rubenv/sql-migrate v1.7.0 // indirect
8285
github.com/russross/blackfriday/v2 v2.1.0 // indirect
83-
github.com/shopspring/decimal v1.3.1 // indirect
86+
github.com/shopspring/decimal v1.4.0 // indirect
8487
github.com/sirupsen/logrus v1.9.3 // indirect
85-
github.com/spf13/cast v1.6.0 // indirect
88+
github.com/spf13/cast v1.7.0 // indirect
89+
github.com/x448/float16 v0.8.4 // indirect
8690
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
8791
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
8892
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
8993
github.com/xlab/treeprint v1.2.0 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
91-
go.opentelemetry.io/otel v1.21.0 // indirect
92-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
93-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
94-
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
95-
golang.org/x/crypto v0.23.0 // indirect
96-
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
97-
golang.org/x/sync v0.6.0 // indirect
98-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
99-
google.golang.org/grpc v1.60.1 // indirect
100-
gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
101-
helm.sh/helm/v3 v3.15.2 // indirect
102-
k8s.io/apiserver v0.30.0 // indirect
103-
k8s.io/cli-runtime v0.30.0 // indirect
104-
k8s.io/component-base v0.30.0 // indirect
105-
k8s.io/kubectl v0.30.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
102+
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
106108
oras.land/oras-go v1.2.5 // indirect
107-
sigs.k8s.io/kustomize/api v0.16.0 // indirect
108-
sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect
109+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
110+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
109111
)
110112

111113
require (
112-
github.com/davecgh/go-spew v1.1.1 // indirect
114+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
113115
github.com/emicklei/go-restful/v3 v3.11.1 // indirect
114-
github.com/go-logr/logr v1.4.1 // indirect
115-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
116+
github.com/go-logr/logr v1.4.2 // indirect
117+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
116118
github.com/go-openapi/jsonreference v0.20.4 // indirect
117-
github.com/go-openapi/swag v0.22.7 // indirect
119+
github.com/go-openapi/swag v0.23.0 // indirect
118120
github.com/gogo/protobuf v1.3.2 // indirect
119121
github.com/golang/protobuf v1.5.4 // indirect
120122
github.com/google/gnostic-models v0.6.8 // indirect
121123
github.com/google/gofuzz v1.2.0 // indirect
122-
github.com/google/uuid v1.5.0 // indirect
123-
github.com/imdario/mergo v0.3.16 // indirect
124+
github.com/google/uuid v1.6.0 // indirect
124125
github.com/josharian/intern v1.0.0 // indirect
125126
github.com/json-iterator/go v1.1.12 // indirect
126127
github.com/mailru/easyjson v0.7.7 // indirect
127128
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
128129
github.com/modern-go/reflect2 v1.0.2 // indirect
129130
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
130131
github.com/spf13/pflag v1.0.5 // indirect
131-
golang.org/x/net v0.23.0 // indirect
132-
golang.org/x/oauth2 v0.15.0 // indirect
133-
golang.org/x/sys v0.20.0 // indirect
134-
golang.org/x/term v0.20.0 // indirect
135-
golang.org/x/text v0.15.0 // indirect
136-
golang.org/x/time v0.5.0 // indirect
137-
google.golang.org/appengine v1.6.8 // indirect
138-
google.golang.org/protobuf v1.33.0 // 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
139139
gopkg.in/inf.v0 v0.9.1 // indirect
140-
gopkg.in/yaml.v2 v2.4.0 // indirect
141140
gopkg.in/yaml.v3 v3.0.1 // indirect
142-
k8s.io/api v0.30.3
143-
k8s.io/apiextensions-apiserver v0.30.0
144-
k8s.io/apimachinery v0.30.3
145-
k8s.io/klog/v2 v2.120.1 // indirect
146-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
147-
k8s.io/metrics v0.30.0
148-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
149-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
141+
k8s.io/api v0.32.3
142+
k8s.io/apiextensions-apiserver v0.32.3
143+
k8s.io/apimachinery v0.32.3
144+
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
151150
sigs.k8s.io/yaml v1.4.0 // indirect
152151
)

0 commit comments

Comments
 (0)