Skip to content

Commit 9aa0b4e

Browse files
shyamradhakrishnanshyamradhakrishnan
authored
Update to CAPI 1.7 (#364)
* Update to CAPI 1.7
1 parent a1ea85b commit 9aa0b4e

File tree

10 files changed

+239
-576
lines changed

10 files changed

+239
-576
lines changed

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ IMG ?= controller:latest
4949
CRD_OPTIONS ?= "crd"
5050

5151
# enable machine pool feature
52-
EXP_MACHINE_POOL ?= false
52+
EXP_MACHINE_POOL ?= true
5353

5454
# Set build time variables including version details
5555
LDFLAGS := $(shell source ./hack/version.sh; version::ldflags)
@@ -378,7 +378,7 @@ $(KUSTOMIZE): ## Download kustomize locally if necessary.
378378
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) v4.5.2
379379

380380
$(GINKGO): ## Build ginkgo.
381-
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.13.1
381+
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.17.1
382382

383383
$(GOLANGCI_LINT): ## Build golanci-lint.
384384
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) v1.44.0

‎cloud/scope/clients.go

-1
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,3 @@ func setVersionHeader() func(request *http.Request) error {
323323
return nil
324324
}
325325
}
326-

‎config/manager/manager.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- /manager
2828
args:
2929
- "--leader-elect"
30-
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}"
30+
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=true}"
3131
- "--metrics-bind-address=127.0.0.1:8080"
3232
- "--logging-format=${LOG_FORMAT:=text}"
3333
- "--init-oci-clients-on-startup=${INIT_OCI_CLIENTS_ON_STARTUP:=true}"

‎docs/src/managed/managedcluster.md

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Managed Clusters (OKE)
2-
- **Feature status:** As of CAPOCI v0.12.0, OKE has been moved out of experimental mode with self managed nodes.
3-
Virtual Node Pool and Mnagaed Node Pool are still experimental due to underlying CAPI dependencies.
4-
- **Feature gate:** MachinePool=true
52

6-
Cluster API Provider for OCI (CAPOCI) experimentally supports managing OCI Container
3+
Cluster API Provider for OCI (CAPOCI) supports managing OCI Container
74
Engine for Kubernetes (OKE) clusters. CAPOCI implements this with three
85
custom resources:
96
- `OCIManagedControlPlane`
@@ -37,15 +34,6 @@ The following Cluster API parameters are also available:
3734

3835
## Pre-Requisites
3936

40-
### Environment Variables
41-
42-
Managed clusters also require the following feature flags set as environment variables before [installing
43-
CAPI and CAPOCI components using clusterctl][install-cluster-api].
44-
45-
```bash
46-
export EXP_MACHINE_POOL=true
47-
```
48-
4937
### OCI Security Policies
5038

5139
Please read the [doc][oke-policies] and add the necessary policies required for the user group.

‎feature/feature.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func init() {
3737
// To add a new feature, define a key for it above and add it here.
3838
var defaultCAPOCIFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
3939
// Every feature should be initiated here:
40-
MachinePool: {Default: false, PreRelease: featuregate.Alpha},
40+
MachinePool: {Default: true, PreRelease: featuregate.Beta},
4141
// Every feature should be initiated here:
42-
OKE: {Default: false, PreRelease: featuregate.Alpha},
42+
OKE: {Default: true, PreRelease: featuregate.Beta},
4343
}

‎go.mod

+59-52
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
module github.com/oracle/cluster-api-provider-oci
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.8
46

57
require (
6-
github.com/go-logr/logr v1.3.0
8+
github.com/go-logr/logr v1.4.1
79
github.com/golang/mock v1.6.0
810
github.com/google/gofuzz v1.2.0
9-
github.com/onsi/ginkgo/v2 v2.13.1
10-
github.com/onsi/gomega v1.30.0
11+
github.com/onsi/ginkgo/v2 v2.17.1
12+
github.com/onsi/gomega v1.32.0
1113
github.com/oracle/oci-go-sdk/v65 v65.61.2
1214
github.com/pkg/errors v0.9.1
13-
github.com/prometheus/client_golang v1.17.0
15+
github.com/prometheus/client_golang v1.18.0
1416
github.com/spf13/pflag v1.0.5
1517
gopkg.in/yaml.v2 v2.4.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.3
23-
sigs.k8s.io/cluster-api/test v1.6.3
24-
sigs.k8s.io/controller-runtime v0.16.5
25-
sigs.k8s.io/kind v0.21.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
23+
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
2628
)
2729

2830
require (
@@ -43,16 +45,17 @@ require (
4345
github.com/cloudflare/circl v1.3.7 // indirect
4446
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4547
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
48-
github.com/docker/go-connections v0.4.0 // indirect
48+
github.com/docker/docker v25.0.5+incompatible // indirect
49+
github.com/docker/go-connections v0.5.0 // indirect
4950
github.com/docker/go-units v0.4.0 // indirect
5051
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
51-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
52-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
53-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
54-
github.com/fsnotify/fsnotify v1.6.0 // indirect
55-
github.com/go-logr/zapr v1.2.4 // indirect
52+
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
53+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
54+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
55+
github.com/felixge/httpsnoop v1.0.4 // indirect
56+
github.com/fsnotify/fsnotify v1.7.0 // indirect
57+
github.com/go-logr/stdr v1.2.2 // indirect
58+
github.com/go-logr/zapr v1.3.0 // indirect
5659
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5760
github.com/go-openapi/jsonreference v0.20.2 // indirect
5861
github.com/go-openapi/swag v0.22.3 // indirect
@@ -61,15 +64,15 @@ require (
6164
github.com/gofrs/flock v0.8.1 // indirect
6265
github.com/gogo/protobuf v1.3.2 // indirect
6366
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
64-
github.com/golang/protobuf v1.5.3 // indirect
65-
github.com/google/cel-go v0.16.1 // indirect
67+
github.com/golang/protobuf v1.5.4 // indirect
68+
github.com/google/cel-go v0.17.7 // indirect
6669
github.com/google/gnostic-models v0.6.8 // indirect
6770
github.com/google/go-cmp v0.6.0 // indirect
6871
github.com/google/go-github/v53 v53.2.0 // indirect
6972
github.com/google/go-querystring v1.1.0 // indirect
7073
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7174
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
72-
github.com/google/uuid v1.3.1 // indirect
75+
github.com/google/uuid v1.4.0 // indirect
7376
github.com/hashicorp/hcl v1.0.0 // indirect
7477
github.com/huandu/xstrings v1.3.3 // indirect
7578
github.com/imdario/mergo v0.3.13 // indirect
@@ -79,7 +82,7 @@ require (
7982
github.com/magiconair/properties v1.8.7 // indirect
8083
github.com/mailru/easyjson v0.7.7 // indirect
8184
github.com/mattn/go-isatty v0.0.20 // indirect
82-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
85+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
8386
github.com/mitchellh/copystructure v1.2.0 // indirect
8487
github.com/mitchellh/mapstructure v1.5.0 // indirect
8588
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -90,48 +93,52 @@ require (
9093
github.com/opencontainers/image-spec v1.0.2 // indirect
9194
github.com/pelletier/go-toml v1.9.5 // indirect
9295
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
96+
github.com/prometheus/client_model v0.5.0 // indirect
97+
github.com/prometheus/common v0.45.0 // indirect
98+
github.com/prometheus/procfs v0.12.0 // indirect
99+
github.com/sagikazarmark/locafero v0.4.0 // indirect
97100
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
98101
github.com/shopspring/decimal v1.3.1 // indirect
99102
github.com/sony/gobreaker v0.5.0 // indirect
100103
github.com/sourcegraph/conc v0.3.0 // indirect
101-
github.com/spf13/afero v1.10.0 // indirect
102-
github.com/spf13/cast v1.5.1 // indirect
104+
github.com/spf13/afero v1.11.0 // indirect
105+
github.com/spf13/cast v1.6.0 // indirect
103106
github.com/spf13/cobra v1.8.0 // indirect
104-
github.com/spf13/viper v1.17.0 // indirect
107+
github.com/spf13/viper v1.18.2 // indirect
105108
github.com/stoewer/go-strcase v1.2.0 // indirect
106109
github.com/subosito/gotenv v1.6.0 // indirect
107110
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
108115
go.uber.org/multierr v1.11.0 // indirect
109-
go.uber.org/zap v1.25.0 // indirect
110-
golang.org/x/crypto v0.17.0 // indirect
116+
go.uber.org/zap v1.26.0 // indirect
117+
golang.org/x/crypto v0.21.0 // indirect
111118
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.15.0 // indirect
116-
golang.org/x/term v0.15.0 // 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
117124
golang.org/x/text v0.14.0 // indirect
118-
golang.org/x/time v0.3.0 // indirect
119-
golang.org/x/tools v0.14.0 // indirect
125+
golang.org/x/time v0.5.0 // indirect
126+
golang.org/x/tools v0.17.0 // indirect
120127
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
121-
google.golang.org/appengine v1.6.7 // 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
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
124131
google.golang.org/protobuf v1.33.0 // indirect
125132
gopkg.in/inf.v0 v0.9.1 // indirect
126133
gopkg.in/ini.v1 v1.67.0 // indirect
127134
gopkg.in/yaml.v3 v3.0.1 // 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
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
132139
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
133-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
140+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
134141
sigs.k8s.io/yaml v1.4.0 // indirect
135142
)
136143

137-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0
144+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0

0 commit comments

Comments
 (0)