Skip to content

Commit 9fcbb6f

Browse files
authored
Merge pull request #607 from kartverket/bump-nais-deps
Bump NAIS depedendencies
2 parents 53924ca + bcf997f commit 9fcbb6f

File tree

5 files changed

+94
-23
lines changed

5 files changed

+94
-23
lines changed

config/crd/skiperator.kartverket.no_applications.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ spec:
856856
The default separator is `:`. If `name` contains `/`, the default separator is instead `/`.
857857
maxLength: 1
858858
minLength: 1
859-
pattern: ^[\/:]$
859+
pattern: ^[\/:.]$
860860
type: string
861861
visibility:
862862
description: |-

go.mod

+29-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/kartverket/skiperator
22

3-
go 1.23.4
3+
go 1.23.6
4+
5+
toolchain go1.24.0
46

57
require (
68
dario.cat/mergo v1.0.1
@@ -10,8 +12,8 @@ require (
1012
github.com/google/k8s-digester v0.1.16
1113
github.com/kyverno/chainsaw v0.2.12
1214
github.com/mitchellh/hashstructure/v2 v2.0.2
13-
github.com/nais/digdirator v0.0.0-20250120231831-742d74849567
14-
github.com/nais/liberator v0.0.0-20250120121331-1a7304c71267
15+
github.com/nais/digdirator v0.0.0-20250217235133-18c79036ecdf
16+
github.com/nais/liberator v0.0.0-20250212071940-b052d0557cca
1517
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.79.2
1618
github.com/r3labs/diff/v3 v3.0.1
1719
github.com/stretchr/testify v1.10.0
@@ -20,11 +22,11 @@ require (
2022
google.golang.org/protobuf v1.36.4
2123
istio.io/api v1.24.2
2224
istio.io/client-go v1.24.2
23-
k8s.io/api v0.32.1
25+
k8s.io/api v0.32.2
2426
k8s.io/apiextensions-apiserver v0.32.1
25-
k8s.io/apimachinery v0.32.1
26-
k8s.io/client-go v0.32.1
27-
sigs.k8s.io/controller-runtime v0.20.1
27+
k8s.io/apimachinery v0.32.2
28+
k8s.io/client-go v0.32.2
29+
sigs.k8s.io/controller-runtime v0.20.2
2830
sigs.k8s.io/controller-tools v0.17.1
2931
sigs.k8s.io/kustomize/kyaml v0.19.0
3032
)
@@ -47,6 +49,7 @@ require (
4749
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
4850
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4951
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
52+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
5053
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
5154
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
5255
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
@@ -97,7 +100,7 @@ require (
97100
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
98101
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
99102
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
100-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
103+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
101104
github.com/fatih/color v1.18.0 // indirect
102105
github.com/felixge/httpsnoop v1.0.4 // indirect
103106
github.com/fsnotify/fsnotify v1.8.0 // indirect
@@ -147,7 +150,7 @@ require (
147150
github.com/kyverno/kyverno-json v0.0.4-0.20241008103124-b294ee72a2bf // indirect
148151
github.com/kyverno/pkg/ext v0.0.0-20240418121121-df8add26c55c // indirect
149152
github.com/magiconair/properties v1.8.9 // indirect
150-
github.com/mailru/easyjson v0.7.7 // indirect
153+
github.com/mailru/easyjson v0.9.0 // indirect
151154
github.com/mattn/go-colorable v0.1.13 // indirect
152155
github.com/mattn/go-isatty v0.0.20 // indirect
153156
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -167,7 +170,7 @@ require (
167170
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
168171
github.com/prometheus/client_golang v1.20.5 // indirect
169172
github.com/prometheus/client_model v0.6.1 // indirect
170-
github.com/prometheus/common v0.61.0 // indirect
173+
github.com/prometheus/common v0.62.0 // indirect
171174
github.com/prometheus/procfs v0.15.1 // indirect
172175
github.com/russross/blackfriday/v2 v2.1.0 // indirect
173176
github.com/sagikazarmark/locafero v0.6.0 // indirect
@@ -177,7 +180,7 @@ require (
177180
github.com/spf13/afero v1.11.0 // indirect
178181
github.com/spf13/cast v1.7.0 // indirect
179182
github.com/spf13/cobra v1.8.1 // indirect
180-
github.com/spf13/pflag v1.0.5 // indirect
183+
github.com/spf13/pflag v1.0.6 // indirect
181184
github.com/spf13/viper v1.19.0 // indirect
182185
github.com/stoewer/go-strcase v1.3.0 // indirect
183186
github.com/subosito/gotenv v1.6.0 // indirect
@@ -205,16 +208,19 @@ require (
205208
go.opentelemetry.io/otel/trace v1.30.0 // indirect
206209
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
207210
go.uber.org/multierr v1.11.0 // indirect
208-
golang.org/x/crypto v0.32.0 // indirect
209-
golang.org/x/mod v0.22.0 // indirect
210-
golang.org/x/net v0.34.0 // indirect
211-
golang.org/x/oauth2 v0.24.0 // indirect
212-
golang.org/x/sync v0.10.0 // indirect
213-
golang.org/x/sys v0.29.0 // indirect
214-
golang.org/x/term v0.28.0 // indirect
215-
golang.org/x/text v0.21.0 // indirect
216-
golang.org/x/time v0.8.0 // indirect
217-
golang.org/x/tools v0.29.0 // indirect
211+
golang.org/x/crypto v0.33.0 // indirect
212+
golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
213+
golang.org/x/mod v0.23.0 // indirect
214+
golang.org/x/net v0.35.0 // indirect
215+
golang.org/x/oauth2 v0.26.0 // indirect
216+
golang.org/x/sync v0.11.0 // indirect
217+
golang.org/x/sys v0.30.0 // indirect
218+
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
219+
golang.org/x/term v0.29.0 // indirect
220+
golang.org/x/text v0.22.0 // indirect
221+
golang.org/x/time v0.10.0 // indirect
222+
golang.org/x/tools v0.30.0 // indirect
223+
golang.org/x/vuln v1.1.4 // indirect
218224
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
219225
google.golang.org/api v0.214.0 // indirect
220226
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
@@ -226,11 +232,13 @@ require (
226232
gopkg.in/ini.v1 v1.67.0 // indirect
227233
gopkg.in/yaml.v2 v2.4.0 // indirect
228234
gopkg.in/yaml.v3 v3.0.1 // indirect
235+
honnef.co/go/tools v0.6.0 // indirect
229236
k8s.io/apiserver v0.32.1 // indirect
230237
k8s.io/component-base v0.32.1 // indirect
231238
k8s.io/klog/v2 v2.130.1 // indirect
232239
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
233240
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
241+
mvdan.cc/gofumpt v0.7.0 // indirect
234242
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
235243
sigs.k8s.io/gateway-api v1.1.0 // indirect
236244
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect

0 commit comments

Comments
 (0)