Skip to content

Commit ae37e28

Browse files
authored
Merge pull request #458 from mergenci/bump-crossplane-runtime-v1.18.0
Bump crossplane-runtime version to v1.18.0
2 parents 7a4c1dd + c745c8c commit ae37e28

7 files changed

Lines changed: 171 additions & 146 deletions

File tree

.golangci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,16 @@ issues:
181181
linters:
182182
- musttag
183183

184+
# This exclusion is necessary because this package relies on deprecated
185+
# functions and fields to maintain compatibility with older versions. This
186+
# package acts as a migration framework, supporting users coming from
187+
# previous versions. In the future, we may extract this package into a
188+
# separate module and decouple its dependencies from upjet.
189+
- path: pkg/migration/
190+
linters:
191+
- staticcheck
192+
text: "SA1019:"
193+
184194
# Independently from option `exclude` we use default exclude patterns,
185195
# it can be disabled by this option. To list all
186196
# excluded by default patterns execute `golangci-lint run --help`.

go.mod

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ module github.com/crossplane/upjet
77
go 1.23.6
88

99
require (
10-
dario.cat/mergo v1.0.0
10+
dario.cat/mergo v1.0.1
1111
github.com/alecthomas/kingpin/v2 v2.4.0
1212
github.com/antchfx/htmlquery v1.2.4
13-
github.com/crossplane/crossplane v1.13.2
14-
github.com/crossplane/crossplane-runtime v1.17.0
13+
github.com/crossplane/crossplane v1.18.0
14+
github.com/crossplane/crossplane-runtime v1.18.0
1515
github.com/fatih/camelcase v1.0.0
1616
github.com/golang/mock v1.6.0
1717
github.com/google/go-cmp v0.6.0
@@ -26,52 +26,54 @@ require (
2626
github.com/mitchellh/go-ps v1.0.0
2727
github.com/muvaf/typewriter v0.0.0-20210910160850-80e49fe1eb32
2828
github.com/pkg/errors v0.9.1
29-
github.com/prometheus/client_golang v1.19.1
29+
github.com/prometheus/client_golang v1.20.2
3030
github.com/spf13/afero v1.11.0
3131
github.com/tmccombs/hcl2json v0.3.3
3232
github.com/yuin/goldmark v1.4.13
3333
github.com/zclconf/go-cty v1.14.1
3434
github.com/zclconf/go-cty-yaml v1.0.3
3535
golang.org/x/net v0.39.0
36-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
36+
golang.org/x/tools v0.26.0
3737
gopkg.in/yaml.v2 v2.4.0
3838
gopkg.in/yaml.v3 v3.0.1
39-
k8s.io/api v0.30.0
40-
k8s.io/apimachinery v0.30.0
41-
k8s.io/cli-runtime v0.28.2
42-
k8s.io/client-go v0.30.0
43-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
44-
sigs.k8s.io/controller-runtime v0.18.2
39+
k8s.io/api v0.31.2
40+
k8s.io/apimachinery v0.31.2
41+
k8s.io/cli-runtime v0.29.1
42+
k8s.io/client-go v0.31.2
43+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
44+
sigs.k8s.io/controller-runtime v0.19.0
4545
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
4646
sigs.k8s.io/yaml v1.4.0
4747
)
4848

4949
require (
50+
github.com/Masterminds/semver v1.5.0 // indirect
5051
github.com/agext/levenshtein v1.2.3 // indirect
5152
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
5253
github.com/antchfx/xpath v1.2.0 // indirect
5354
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
5455
github.com/beorn7/perks v1.0.1 // indirect
5556
github.com/blang/semver/v4 v4.0.0 // indirect
56-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
57-
github.com/davecgh/go-spew v1.1.1 // indirect
58-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
57+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
58+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
59+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5960
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
6061
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
61-
github.com/fatih/color v1.16.0 // indirect
62+
github.com/fatih/color v1.18.0 // indirect
6263
github.com/fsnotify/fsnotify v1.7.0 // indirect
64+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6365
github.com/go-errors/errors v1.4.2 // indirect
6466
github.com/go-logr/logr v1.4.2 // indirect
6567
github.com/go-logr/zapr v1.3.0 // indirect
66-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
67-
github.com/go-openapi/jsonreference v0.20.2 // indirect
68-
github.com/go-openapi/swag v0.22.3 // indirect
69-
github.com/gobuffalo/flect v1.0.2 // indirect
68+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
69+
github.com/go-openapi/jsonreference v0.21.0 // indirect
70+
github.com/go-openapi/swag v0.23.0 // indirect
71+
github.com/gobuffalo/flect v1.0.3 // indirect
7072
github.com/gogo/protobuf v1.3.2 // indirect
7173
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7274
github.com/golang/protobuf v1.5.4 // indirect
73-
github.com/google/btree v1.0.1 // indirect
74-
github.com/google/gnostic-models v0.6.8 // indirect
75+
github.com/google/btree v1.1.2 // indirect
76+
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
7577
github.com/google/gofuzz v1.2.0 // indirect
7678
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7779
github.com/google/uuid v1.6.0 // indirect
@@ -88,6 +90,7 @@ require (
8890
github.com/imdario/mergo v0.3.16 // indirect
8991
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9092
github.com/josharian/intern v1.0.0 // indirect
93+
github.com/klauspost/compress v1.17.9 // indirect
9194
github.com/mailru/easyjson v0.7.7 // indirect
9295
github.com/mattn/go-colorable v0.1.13 // indirect
9396
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -102,38 +105,40 @@ require (
102105
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103106
github.com/oklog/run v1.0.0 // indirect
104107
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
105-
github.com/prometheus/client_model v0.5.0 // indirect
106-
github.com/prometheus/common v0.48.0 // indirect
107-
github.com/prometheus/procfs v0.12.0 // indirect
108-
github.com/spf13/cobra v1.8.0 // indirect
108+
github.com/prometheus/client_model v0.6.1 // indirect
109+
github.com/prometheus/common v0.55.0 // indirect
110+
github.com/prometheus/procfs v0.15.1 // indirect
111+
github.com/spf13/cobra v1.8.1 // indirect
109112
github.com/spf13/pflag v1.0.5 // indirect
110113
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
111114
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
112115
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
116+
github.com/x448/float16 v0.8.4 // indirect
113117
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
114118
github.com/xlab/treeprint v1.2.0 // indirect
115119
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
116120
go.uber.org/multierr v1.11.0 // indirect
117121
go.uber.org/zap v1.27.0 // indirect
118-
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
119-
golang.org/x/mod v0.17.0 // indirect
122+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
123+
golang.org/x/mod v0.21.0 // indirect
120124
golang.org/x/oauth2 v0.28.0 // indirect
121125
golang.org/x/sync v0.13.0 // indirect
122126
golang.org/x/sys v0.32.0 // indirect
123127
golang.org/x/term v0.31.0 // indirect
124128
golang.org/x/text v0.24.0 // indirect
125-
golang.org/x/time v0.5.0 // indirect
129+
golang.org/x/time v0.6.0 // indirect
126130
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
127131
google.golang.org/appengine v1.6.8 // indirect
128-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
129-
google.golang.org/grpc v1.63.2 // indirect
130-
google.golang.org/protobuf v1.34.2 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
133+
google.golang.org/grpc v1.67.1 // indirect
134+
google.golang.org/protobuf v1.35.1 // indirect
135+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
131136
gopkg.in/inf.v0 v0.9.1 // indirect
132-
k8s.io/apiextensions-apiserver v0.30.0 // indirect
133-
k8s.io/component-base v0.30.0 // indirect
134-
k8s.io/klog/v2 v2.120.1 // indirect
135-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
136-
sigs.k8s.io/controller-tools v0.14.0 // indirect
137+
k8s.io/apiextensions-apiserver v0.31.2 // indirect
138+
k8s.io/component-base v0.31.2 // indirect
139+
k8s.io/klog/v2 v2.130.1 // indirect
140+
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
141+
sigs.k8s.io/controller-tools v0.16.5 // indirect
137142
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
138143
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
139144
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)