Skip to content

Commit 3af9a67

Browse files
authored
Merge branch 'main' into cleanup_audit
2 parents 4e5120f + 2902917 commit 3af9a67

File tree

3 files changed

+87
-77
lines changed

3 files changed

+87
-77
lines changed

go.mod

+28-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nais/cli
22

3-
go 1.23.2
3+
go 1.23.6
44

55
require (
66
cloud.google.com/go/cloudsqlconn v1.14.2
@@ -10,7 +10,7 @@ require (
1010
github.com/mailgun/raymond/v2 v2.0.48
1111
github.com/mitchellh/go-ps v1.0.0
1212
github.com/nais/device v0.0.0-20231030073017-240e8a0234d9
13-
github.com/nais/liberator v0.0.0-20241101125801-cc4bc469b422
13+
github.com/nais/liberator v0.0.0-20250210140717-70bb7da67963
1414
github.com/onsi/ginkgo/v2 v2.22.2
1515
github.com/onsi/gomega v1.36.2
1616
github.com/pterm/pterm v0.12.80
@@ -20,20 +20,20 @@ require (
2020
github.com/xeipuuv/gojsonschema v1.2.0
2121
go.opentelemetry.io/otel/sdk v1.34.0
2222
go.opentelemetry.io/otel/sdk/metric v1.34.0
23-
golang.org/x/oauth2 v0.25.0
24-
golang.org/x/sync v0.10.0
23+
golang.org/x/oauth2 v0.26.0
24+
golang.org/x/sync v0.11.0
2525
golang.org/x/vuln v1.1.4
2626
google.golang.org/api v0.219.0
2727
google.golang.org/grpc v1.70.0
2828
gopkg.in/yaml.v3 v3.0.1
2929
honnef.co/go/tools v0.5.1
30-
k8s.io/api v0.31.0
31-
k8s.io/apimachinery v0.32.0
32-
k8s.io/client-go v0.31.0
30+
k8s.io/api v0.32.1
31+
k8s.io/apimachinery v0.32.1
32+
k8s.io/client-go v0.32.1
3333
k8s.io/klog/v2 v2.130.1
34-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
34+
k8s.io/utils v0.0.0-20241210054802-24370beab758
3535
mvdan.cc/gofumpt v0.7.0
36-
sigs.k8s.io/controller-runtime v0.19.3
36+
sigs.k8s.io/controller-runtime v0.20.1
3737
)
3838

3939
require (
@@ -50,20 +50,22 @@ require (
5050
github.com/containerd/console v1.0.3 // indirect
5151
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
5252
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
53-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
53+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5454
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
55-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
5656
github.com/felixge/httpsnoop v1.0.4 // indirect
57+
github.com/fsnotify/fsnotify v1.8.0 // indirect
5758
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5859
github.com/go-logr/stdr v1.2.2 // indirect
5960
github.com/go-openapi/jsonpointer v0.21.0 // indirect
60-
github.com/go-openapi/jsonreference v0.20.2 // indirect
61+
github.com/go-openapi/jsonreference v0.21.0 // indirect
6162
github.com/go-openapi/swag v0.23.0 // indirect
6263
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6364
github.com/gogo/protobuf v1.3.2 // indirect
6465
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6566
github.com/golang/protobuf v1.5.4 // indirect
66-
github.com/google/gnostic-models v0.6.8 // indirect
67+
github.com/google/btree v1.1.3 // indirect
68+
github.com/google/gnostic-models v0.6.9 // indirect
6769
github.com/google/go-cmp v0.6.0 // indirect
6870
github.com/google/gofuzz v1.2.0 // indirect
6971
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
@@ -76,25 +78,26 @@ require (
7678
github.com/imdario/mergo v0.3.16 // indirect
7779
github.com/josharian/intern v1.0.0 // indirect
7880
github.com/json-iterator/go v1.1.12 // indirect
81+
github.com/klauspost/compress v1.17.11 // indirect
7982
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
8083
github.com/lib/pq v1.10.9
8184
github.com/lithammer/fuzzysearch v1.1.8 // indirect
82-
github.com/mailru/easyjson v0.7.7 // indirect
85+
github.com/mailru/easyjson v0.9.0 // indirect
8386
github.com/mattn/go-runewidth v0.0.16 // indirect
8487
github.com/mitchellh/hashstructure v1.1.0 // indirect
8588
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8689
github.com/modern-go/reflect2 v1.0.2 // indirect
8790
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8891
github.com/pkg/errors v0.9.1 // indirect
8992
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
90-
github.com/prometheus/client_golang v1.19.1 // indirect
93+
github.com/prometheus/client_golang v1.20.5 // indirect
9194
github.com/prometheus/client_model v0.6.1 // indirect
92-
github.com/prometheus/common v0.55.0 // indirect
95+
github.com/prometheus/common v0.62.0 // indirect
9396
github.com/prometheus/procfs v0.15.1 // indirect
9497
github.com/rivo/uniseg v0.4.7 // indirect
9598
github.com/russross/blackfriday/v2 v2.1.0 // indirect
9699
github.com/sirupsen/logrus v1.9.3 // indirect
97-
github.com/spf13/pflag v1.0.5 // indirect
100+
github.com/spf13/pflag v1.0.6 // indirect
98101
github.com/stretchr/objx v0.5.2 // indirect
99102
github.com/x448/float16 v0.8.4 // indirect
100103
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -116,21 +119,21 @@ require (
116119
golang.org/x/exp/typeparams v0.0.0-20241009180824-f66d83c29e7c // indirect
117120
golang.org/x/mod v0.22.0 // indirect
118121
golang.org/x/net v0.34.0 // indirect
119-
golang.org/x/sys v0.29.0 // indirect
122+
golang.org/x/sys v0.30.0 // indirect
120123
golang.org/x/telemetry v0.0.0-20241004145657-5eebfecbdf1f // indirect
121-
golang.org/x/term v0.28.0 // indirect
122-
golang.org/x/text v0.21.0 // indirect
123-
golang.org/x/time v0.9.0 // indirect
124+
golang.org/x/term v0.29.0 // indirect
125+
golang.org/x/text v0.22.0 // indirect
126+
golang.org/x/time v0.10.0 // indirect
124127
golang.org/x/tools v0.29.0 // indirect
125128
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
126129
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
127130
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
128131
google.golang.org/protobuf v1.36.4 // indirect
129132
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
130133
gopkg.in/inf.v0 v0.9.1 // indirect
131-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
132-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
133-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
134-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
134+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
135+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
136+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
137+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
135138
sigs.k8s.io/yaml v1.4.0 // indirect
136139
)

0 commit comments

Comments
 (0)