Skip to content

Commit 22a4d4c

Browse files
joekrjoekr
committed
bump CAPI to 1.8.1
1 parent 305c79a commit 22a4d4c

File tree

7 files changed

+181
-199
lines changed

7 files changed

+181
-199
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.21.8 as builder
2+
FROM golang:1.22.6 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
377377
kubectl: $(KUBECTL) ## Build a local copy of kubectl.
378378

379379
$(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
380-
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.13.0
380+
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.14.0
381381

382382
$(CONVERSION_GEN): ## Download controller-gen locally if necessary.
383383
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.23.1
@@ -386,7 +386,7 @@ $(KUSTOMIZE): ## Download kustomize locally if necessary.
386386
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) v4.5.2
387387

388388
$(GINKGO): ## Build ginkgo.
389-
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.17.1
389+
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.19.1
390390

391391
$(GOLANGCI_LINT): ## Build golanci-lint.
392392
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BIN_DIR) $(GOLANGCI_LINT_VERSION)

‎Tiltfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capoci",
22-
"capi_version": "v1.4.1",
23-
"cert_manager_version": "v1.11.0",
24-
"kubernetes_version": "v1.24.3",
22+
"capi_version": "v1.8.1",
23+
"cert_manager_version": "v1.15.2",
24+
"kubernetes_version": "v1.30.0",
2525
}
2626

2727
# global settings
@@ -41,7 +41,7 @@ if "default_registry" in settings:
4141

4242
tilt_helper_dockerfile_header = """
4343
# Tilt image
44-
FROM golang:1.21.8 as tilt-helper
44+
FROM golang:1.22.6 as tilt-helper
4545
# Support live reloading with Tilt
4646
RUN go install github.com/go-delve/delve/cmd/dlv@latest
4747
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \

‎go.mod‎

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
module github.com/oracle/cluster-api-provider-oci
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.21.8
5+
toolchain go1.22.6
66

77
require (
8-
github.com/go-logr/logr v1.4.1
8+
github.com/go-logr/logr v1.4.2
99
github.com/golang/mock v1.6.0
10+
github.com/google/go-cmp v0.6.0
1011
github.com/google/gofuzz v1.2.0
11-
github.com/onsi/ginkgo/v2 v2.17.1
12-
github.com/onsi/gomega v1.32.0
12+
github.com/onsi/ginkgo/v2 v2.19.1
13+
github.com/onsi/gomega v1.34.0
1314
github.com/oracle/oci-go-sdk/v65 v65.81.1
1415
github.com/pkg/errors v0.9.1
1516
github.com/prometheus/client_golang v1.18.0
1617
github.com/spf13/pflag v1.0.5
1718
gopkg.in/yaml.v2 v2.4.0
18-
k8s.io/api v0.29.3
19-
k8s.io/apimachinery v0.29.3
20-
k8s.io/client-go v0.29.3
21-
k8s.io/component-base v0.29.3
22-
k8s.io/klog/v2 v2.110.1
19+
k8s.io/api v0.30.3
20+
k8s.io/apimachinery v0.30.3
21+
k8s.io/client-go v0.30.3
22+
k8s.io/component-base v0.30.3
23+
k8s.io/klog/v2 v2.120.1
2324
k8s.io/utils v0.0.0-20231127182322-b307cd553661
24-
sigs.k8s.io/cluster-api v1.7.0
25-
sigs.k8s.io/cluster-api/test v1.7.0
26-
sigs.k8s.io/controller-runtime v0.17.3
27-
sigs.k8s.io/kind v0.22.0
25+
sigs.k8s.io/cluster-api v1.8.1
26+
sigs.k8s.io/cluster-api/test v1.8.1
27+
sigs.k8s.io/controller-runtime v0.18.5
28+
sigs.k8s.io/kind v0.23.0
2829
)
2930

3031
require (
@@ -35,21 +36,22 @@ require (
3536
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3637
github.com/Microsoft/go-winio v0.5.0 // indirect
3738
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
38-
github.com/adrg/xdg v0.4.0 // indirect
39+
github.com/adrg/xdg v0.5.0 // indirect
3940
github.com/alessio/shellescape v1.4.1 // indirect
4041
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4142
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4243
github.com/beorn7/perks v1.0.1 // indirect
4344
github.com/blang/semver/v4 v4.0.0 // indirect
45+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4446
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4547
github.com/cloudflare/circl v1.3.7 // indirect
4648
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
47-
github.com/distribution/reference v0.5.0 // indirect
48-
github.com/docker/docker v25.0.5+incompatible // indirect
49+
github.com/distribution/reference v0.6.0 // indirect
50+
github.com/docker/docker v27.1.1+incompatible // indirect
4951
github.com/docker/go-connections v0.5.0 // indirect
5052
github.com/docker/go-units v0.4.0 // indirect
5153
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
52-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
54+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
5355
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
5456
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5557
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -59,20 +61,20 @@ require (
5961
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6062
github.com/go-openapi/jsonreference v0.20.2 // indirect
6163
github.com/go-openapi/swag v0.22.3 // indirect
62-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
64+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6365
github.com/gobuffalo/flect v1.0.2 // indirect
6466
github.com/gofrs/flock v0.8.1 // indirect
6567
github.com/gogo/protobuf v1.3.2 // indirect
6668
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6769
github.com/golang/protobuf v1.5.4 // indirect
68-
github.com/google/cel-go v0.17.7 // indirect
70+
github.com/google/cel-go v0.17.8 // indirect
6971
github.com/google/gnostic-models v0.6.8 // indirect
70-
github.com/google/go-cmp v0.6.0 // indirect
7172
github.com/google/go-github/v53 v53.2.0 // indirect
7273
github.com/google/go-querystring v1.1.0 // indirect
73-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
74+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
7475
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
75-
github.com/google/uuid v1.4.0 // indirect
76+
github.com/google/uuid v1.6.0 // indirect
77+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
7678
github.com/hashicorp/hcl v1.0.0 // indirect
7779
github.com/huandu/xstrings v1.3.3 // indirect
7880
github.com/imdario/mergo v0.3.13 // indirect
@@ -86,14 +88,15 @@ require (
8688
github.com/mitchellh/copystructure v1.2.0 // indirect
8789
github.com/mitchellh/mapstructure v1.5.0 // indirect
8890
github.com/mitchellh/reflectwalk v1.0.2 // indirect
91+
github.com/moby/docker-image-spec v1.3.1 // indirect
8992
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9093
github.com/modern-go/reflect2 v1.0.2 // indirect
9194
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9295
github.com/opencontainers/go-digest v1.0.0 // indirect
9396
github.com/opencontainers/image-spec v1.0.2 // indirect
9497
github.com/pelletier/go-toml v1.9.5 // indirect
95-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
96-
github.com/prometheus/client_model v0.5.0 // indirect
98+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
99+
github.com/prometheus/client_model v0.6.0 // indirect
97100
github.com/prometheus/common v0.45.0 // indirect
98101
github.com/prometheus/procfs v0.12.0 // indirect
99102
github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -103,42 +106,47 @@ require (
103106
github.com/sourcegraph/conc v0.3.0 // indirect
104107
github.com/spf13/afero v1.11.0 // indirect
105108
github.com/spf13/cast v1.6.0 // indirect
106-
github.com/spf13/cobra v1.8.0 // indirect
107-
github.com/spf13/viper v1.18.2 // indirect
109+
github.com/spf13/cobra v1.8.1 // indirect
110+
github.com/spf13/viper v1.19.0 // indirect
108111
github.com/stoewer/go-strcase v1.2.0 // indirect
109112
github.com/subosito/gotenv v1.6.0 // indirect
110113
github.com/valyala/fastjson v1.6.4 // indirect
111-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
112-
go.opentelemetry.io/otel v1.22.0 // indirect
113-
go.opentelemetry.io/otel/metric v1.22.0 // indirect
114-
go.opentelemetry.io/otel/trace v1.22.0 // indirect
114+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
115+
go.opentelemetry.io/otel v1.24.0 // indirect
116+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
117+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
118+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
119+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
120+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
121+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
115122
go.uber.org/multierr v1.11.0 // indirect
116-
go.uber.org/zap v1.26.0 // indirect
117-
golang.org/x/crypto v0.21.0 // indirect
123+
go.uber.org/zap v1.27.0 // indirect
124+
golang.org/x/crypto v0.25.0 // indirect
118125
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
119-
golang.org/x/net v0.23.0 // indirect
120-
golang.org/x/oauth2 v0.18.0 // indirect
121-
golang.org/x/sync v0.6.0 // indirect
122-
golang.org/x/sys v0.18.0 // indirect
123-
golang.org/x/term v0.18.0 // indirect
124-
golang.org/x/text v0.14.0 // indirect
126+
golang.org/x/net v0.27.0 // indirect
127+
golang.org/x/oauth2 v0.21.0 // indirect
128+
golang.org/x/sync v0.7.0 // indirect
129+
golang.org/x/sys v0.22.0 // indirect
130+
golang.org/x/term v0.22.0 // indirect
131+
golang.org/x/text v0.16.0 // indirect
125132
golang.org/x/time v0.5.0 // indirect
126-
golang.org/x/tools v0.17.0 // indirect
133+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
127134
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
128-
google.golang.org/appengine v1.6.8 // indirect
129-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
131-
google.golang.org/protobuf v1.33.0 // indirect
135+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
137+
google.golang.org/grpc v1.62.2 // indirect
138+
google.golang.org/protobuf v1.34.1 // indirect
132139
gopkg.in/inf.v0 v0.9.1 // indirect
133140
gopkg.in/ini.v1 v1.67.0 // indirect
134141
gopkg.in/yaml.v3 v3.0.1 // indirect
135-
k8s.io/apiextensions-apiserver v0.29.3 // indirect
136-
k8s.io/apiserver v0.29.3 // indirect
137-
k8s.io/cluster-bootstrap v0.29.3 // indirect
138-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
142+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
143+
k8s.io/apiserver v0.30.3 // indirect
144+
k8s.io/cluster-bootstrap v0.30.3 // indirect
145+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
146+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
139147
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
140148
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
141149
sigs.k8s.io/yaml v1.4.0 // indirect
142150
)
143151

144-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0
152+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.1

0 commit comments

Comments
 (0)