Skip to content

Commit 3e14e22

Browse files
Update to CAPI 1.6 (#344)
1 parent 5407081 commit 3e14e22

File tree

5 files changed

+207
-335
lines changed

5 files changed

+207
-335
lines changed

go.mod

+60-56
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ module github.com/oracle/cluster-api-provider-oci
33
go 1.20
44

55
require (
6-
github.com/go-logr/logr v1.2.4
6+
github.com/go-logr/logr v1.3.0
77
github.com/golang/mock v1.6.0
88
github.com/google/gofuzz v1.2.0
9-
github.com/onsi/ginkgo/v2 v2.11.0
10-
github.com/onsi/gomega v1.27.8
9+
github.com/onsi/ginkgo/v2 v2.13.1
10+
github.com/onsi/gomega v1.30.0
1111
github.com/oracle/oci-go-sdk/v65 v65.45.0
1212
github.com/pkg/errors v0.9.1
13-
github.com/prometheus/client_golang v1.16.0
13+
github.com/prometheus/client_golang v1.17.0
1414
github.com/spf13/pflag v1.0.5
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.27.2
17-
k8s.io/apimachinery v0.27.2
18-
k8s.io/client-go v0.27.2
19-
k8s.io/component-base v0.27.2
20-
k8s.io/klog/v2 v2.90.1
21-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
22-
sigs.k8s.io/cluster-api v1.5.0
23-
sigs.k8s.io/cluster-api/test v1.5.0
24-
sigs.k8s.io/controller-runtime v0.15.0
16+
k8s.io/api v0.28.4
17+
k8s.io/apimachinery v0.28.4
18+
k8s.io/client-go v0.28.4
19+
k8s.io/component-base v0.28.4
20+
k8s.io/klog/v2 v2.100.1
21+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
22+
sigs.k8s.io/cluster-api v1.6.0
23+
sigs.k8s.io/cluster-api/test v1.6.0
24+
sigs.k8s.io/controller-runtime v0.16.3
2525
sigs.k8s.io/kind v0.20.0
2626
)
2727

@@ -32,44 +32,44 @@ require (
3232
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3333
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3434
github.com/Microsoft/go-winio v0.5.0 // indirect
35+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
3536
github.com/adrg/xdg v0.4.0 // indirect
3637
github.com/alessio/shellescape v1.4.1 // indirect
37-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
38+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3839
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3940
github.com/beorn7/perks v1.0.1 // indirect
40-
github.com/blang/semver v3.5.1+incompatible // indirect
4141
github.com/blang/semver/v4 v4.0.0 // indirect
4242
github.com/cespare/xxhash/v2 v2.2.0 // indirect
43-
github.com/coredns/caddy v1.1.0 // indirect
44-
github.com/coredns/corefile-migration v1.0.20 // indirect
45-
github.com/davecgh/go-spew v1.1.1 // indirect
46-
github.com/docker/distribution v2.8.2+incompatible // indirect
47-
github.com/docker/docker v24.0.5+incompatible // indirect
43+
github.com/cloudflare/circl v1.3.3 // indirect
44+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
45+
github.com/distribution/reference v0.5.0 // indirect
46+
github.com/docker/distribution v2.8.3+incompatible // indirect
47+
github.com/docker/docker v24.0.7+incompatible // indirect
4848
github.com/docker/go-connections v0.4.0 // indirect
4949
github.com/docker/go-units v0.4.0 // indirect
5050
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
51-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
51+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
5252
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
53-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
53+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5454
github.com/fsnotify/fsnotify v1.6.0 // indirect
5555
github.com/go-logr/zapr v1.2.4 // indirect
5656
github.com/go-openapi/jsonpointer v0.19.6 // indirect
57-
github.com/go-openapi/jsonreference v0.20.1 // indirect
57+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5858
github.com/go-openapi/swag v0.22.3 // indirect
5959
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
6060
github.com/gobuffalo/flect v1.0.2 // indirect
6161
github.com/gofrs/flock v0.8.1 // indirect
6262
github.com/gogo/protobuf v1.3.2 // indirect
6363
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6464
github.com/golang/protobuf v1.5.3 // indirect
65-
github.com/google/cel-go v0.12.6 // indirect
66-
github.com/google/gnostic v0.6.9 // indirect
67-
github.com/google/go-cmp v0.5.9 // indirect
68-
github.com/google/go-github/v48 v48.2.0 // indirect
65+
github.com/google/cel-go v0.16.1 // indirect
66+
github.com/google/gnostic-models v0.6.8 // indirect
67+
github.com/google/go-cmp v0.6.0 // indirect
68+
github.com/google/go-github/v53 v53.2.0 // indirect
6969
github.com/google/go-querystring v1.1.0 // indirect
7070
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7171
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
72-
github.com/google/uuid v1.3.0 // indirect
72+
github.com/google/uuid v1.3.1 // indirect
7373
github.com/hashicorp/hcl v1.0.0 // indirect
7474
github.com/huandu/xstrings v1.3.3 // indirect
7575
github.com/imdario/mergo v0.3.13 // indirect
@@ -78,7 +78,7 @@ require (
7878
github.com/json-iterator/go v1.1.12 // indirect
7979
github.com/magiconair/properties v1.8.7 // indirect
8080
github.com/mailru/easyjson v0.7.7 // indirect
81-
github.com/mattn/go-isatty v0.0.17 // indirect
81+
github.com/mattn/go-isatty v0.0.20 // indirect
8282
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8383
github.com/mitchellh/copystructure v1.2.0 // indirect
8484
github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -89,45 +89,49 @@ require (
8989
github.com/opencontainers/go-digest v1.0.0 // indirect
9090
github.com/opencontainers/image-spec v1.0.2 // indirect
9191
github.com/pelletier/go-toml v1.9.5 // indirect
92-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
93-
github.com/prometheus/client_model v0.4.0 // indirect
94-
github.com/prometheus/common v0.42.0 // indirect
95-
github.com/prometheus/procfs v0.10.1 // indirect
92+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
93+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
94+
github.com/prometheus/common v0.44.0 // indirect
95+
github.com/prometheus/procfs v0.11.1 // indirect
96+
github.com/sagikazarmark/locafero v0.3.0 // indirect
97+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
9698
github.com/shopspring/decimal v1.3.1 // indirect
9799
github.com/sony/gobreaker v0.5.0 // indirect
98-
github.com/spf13/afero v1.9.5 // indirect
100+
github.com/sourcegraph/conc v0.3.0 // indirect
101+
github.com/spf13/afero v1.10.0 // indirect
99102
github.com/spf13/cast v1.5.1 // indirect
100-
github.com/spf13/cobra v1.7.0 // indirect
101-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
102-
github.com/spf13/viper v1.16.0 // indirect
103+
github.com/spf13/cobra v1.8.0 // indirect
104+
github.com/spf13/viper v1.17.0 // indirect
103105
github.com/stoewer/go-strcase v1.2.0 // indirect
104-
github.com/subosito/gotenv v1.4.2 // indirect
106+
github.com/subosito/gotenv v1.6.0 // indirect
105107
github.com/valyala/fastjson v1.6.4 // indirect
106-
go.uber.org/atomic v1.9.0 // indirect
107-
go.uber.org/multierr v1.8.0 // indirect
108-
go.uber.org/zap v1.24.0 // indirect
109-
golang.org/x/crypto v0.11.0 // indirect
110-
golang.org/x/net v0.12.0 // indirect
111-
golang.org/x/oauth2 v0.10.0 // indirect
112-
golang.org/x/sys v0.10.0 // indirect
113-
golang.org/x/term v0.10.0 // indirect
114-
golang.org/x/text v0.11.0 // indirect
108+
go.uber.org/multierr v1.11.0 // indirect
109+
go.uber.org/zap v1.25.0 // indirect
110+
golang.org/x/crypto v0.15.0 // indirect
111+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
112+
golang.org/x/net v0.18.0 // indirect
113+
golang.org/x/oauth2 v0.14.0 // indirect
114+
golang.org/x/sync v0.4.0 // indirect
115+
golang.org/x/sys v0.14.0 // indirect
116+
golang.org/x/term v0.14.0 // indirect
117+
golang.org/x/text v0.14.0 // indirect
115118
golang.org/x/time v0.3.0 // indirect
116-
golang.org/x/tools v0.9.3 // indirect
117-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
119+
golang.org/x/tools v0.14.0 // indirect
120+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
118121
google.golang.org/appengine v1.6.7 // indirect
119-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
122+
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
123+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
120124
google.golang.org/protobuf v1.31.0 // indirect
121125
gopkg.in/inf.v0 v0.9.1 // indirect
122126
gopkg.in/ini.v1 v1.67.0 // indirect
123127
gopkg.in/yaml.v3 v3.0.1 // indirect
124-
k8s.io/apiextensions-apiserver v0.27.2 // indirect
125-
k8s.io/apiserver v0.27.2 // indirect
126-
k8s.io/cluster-bootstrap v0.27.2 // indirect
127-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
128+
k8s.io/apiextensions-apiserver v0.28.4 // indirect
129+
k8s.io/apiserver v0.28.4 // indirect
130+
k8s.io/cluster-bootstrap v0.28.4 // indirect
131+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
128132
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
129133
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
130-
sigs.k8s.io/yaml v1.3.0 // indirect
134+
sigs.k8s.io/yaml v1.4.0 // indirect
131135
)
132136

133-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0
137+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0

0 commit comments

Comments
 (0)