Skip to content

Commit 9e8e8ac

Browse files
committed
🌱 Add CAPOCI provider
1 parent f008f26 commit 9e8e8ac

File tree

6 files changed

+24
-1
lines changed

6 files changed

+24
-1
lines changed

cmd/clusterctl/client/config/providers_client.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const (
4545
IBMCloudProviderName = "ibmcloud"
4646
Metal3ProviderName = "metal3"
4747
NestedProviderName = "nested"
48+
OCIProviderName = "oci"
4849
OpenStackProviderName = "openstack"
4950
PacketProviderName = "packet"
5051
SideroProviderName = "sidero"
@@ -155,6 +156,11 @@ func (p *providersClient) defaults() []Provider {
155156
url: "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/infrastructure-components.yaml",
156157
providerType: clusterctlv1.InfrastructureProviderType,
157158
},
159+
&provider{
160+
name: OCIProviderName,
161+
url: "https://github.com/oracle/cluster-api-provider-oci/releases/latest/infrastructure-components.yaml",
162+
providerType: clusterctlv1.InfrastructureProviderType,
163+
},
158164
&provider{
159165
name: OpenStackProviderName,
160166
url: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/latest/infrastructure-components.yaml",

cmd/clusterctl/client/config_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
7474
config.MAASProviderName,
7575
config.Metal3ProviderName,
7676
config.NestedProviderName,
77+
config.OCIProviderName,
7778
config.OpenStackProviderName,
7879
config.PacketProviderName,
7980
config.SideroProviderName,
@@ -108,6 +109,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
108109
config.MAASProviderName,
109110
config.Metal3ProviderName,
110111
config.NestedProviderName,
112+
config.OCIProviderName,
111113
config.OpenStackProviderName,
112114
config.PacketProviderName,
113115
config.SideroProviderName,

cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ maas InfrastructureProvider https://github.com/spectrocloud/clu
121121
metal3 InfrastructureProvider https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/ infrastructure-components.yaml
122122
my-infra-provider InfrastructureProvider /home/.cluster-api/overrides/infrastructure-docker/latest/ infrastructure-components.yaml
123123
nested InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ infrastructure-components.yaml
124+
oci InfrastructureProvider https://github.com/oracle/cluster-api-provider-oci/releases/latest/ infrastructure-components.yaml
124125
openstack InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/latest/ infrastructure-components.yaml
125126
packet InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/latest/ infrastructure-components.yaml
126127
sidero InfrastructureProvider https://github.com/talos-systems/sidero/releases/latest/ infrastructure-components.yaml
@@ -211,6 +212,10 @@ var expectedOutputYaml = `- File: core_components.yaml
211212
Name: nested
212213
ProviderType: InfrastructureProvider
213214
URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
215+
- File: infrastructure-components.yaml
216+
Name: oci
217+
ProviderType: InfrastructureProvider
218+
URL: https://github.com/oracle/cluster-api-provider-oci/releases/latest/
214219
- File: infrastructure-components.yaml
215220
Name: openstack
216221
ProviderType: InfrastructureProvider

docs/book/src/clusterctl/provider-contract.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ providers.
198198
|CAPN | cluster.x-k8s.io/provider=infrastructure-nested |
199199
|CAPP | cluster.x-k8s.io/provider=infrastructure-packet |
200200
|CAPZ | cluster.x-k8s.io/provider=infrastructure-azure |
201+
|CAPOCI | cluster.x-k8s.io/provider=infrastructure-oci |
201202
|CAPO | cluster.x-k8s.io/provider=infrastructure-openstack |
202203
|CAPDO | cluster.x-k8s.io/provider=infrastructure-digitalocean |
203204
|CAPG | cluster.x-k8s.io/provider=infrastructure-gcp |

docs/book/src/reference/glossary.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ Cluster API Provider Nested
5959
### CAPO
6060
Cluster API Provider OpenStack
6161

62+
### CAPOCI
63+
Cluster API Provider Oracle Cloud Infrastructure (OCI)
64+
6265
### CAPV
6366
Cluster API Provider vSphere
6467

docs/book/src/user/quick-start.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Additional documentation about experimental features can be found in [Experiment
202202
Depending on the infrastructure provider you are planning to use, some additional prerequisites should be satisfied
203203
before getting started with Cluster API. See below for the expected settings for common providers.
204204
205-
{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,OpenStack,vSphere"}}
205+
{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,OCI,OpenStack,vSphere"}}
206206
{{#tab AWS}}
207207
208208
Download the latest binary of `clusterawsadm` from the [AWS provider releases] and make sure to place it in your path.
@@ -329,6 +329,11 @@ Please visit the [Hetzner project][Hetzner provider].
329329
330330
Please visit the [Metal3 project][Metal3 provider].
331331
332+
{{#/tab }}
333+
{{#tab OCI}}
334+
335+
Please follow the Cluster API Provider for [Oracle Cloud Infrastructure (OCI) Getting Started Guide][oci-provider]
336+
332337
{{#/tab }}
333338
{{#tab OpenStack}}
334339
@@ -854,6 +859,7 @@ See the [clusterctl] documentation for more detail about clusterctl supported ac
854859
[management cluster]: ../reference/glossary.md#management-cluster
855860
[Metal3 getting started guide]: https://github.com/metal3-io/cluster-api-provider-metal3/blob/master/docs/getting-started.md
856861
[Metal3 provider]: https://github.com/metal3-io/cluster-api-provider-metal3/
862+
[oci-provider]: https://oracle.github.io/cluster-api-provider-oci/#getting-started
857863
[Equinix Metal getting started guide]: https://github.com/kubernetes-sigs/cluster-api-provider-packet#using
858864
[provider]:../reference/providers.md
859865
[provider components]: ../reference/glossary.md#provider-components

0 commit comments

Comments
 (0)