Merge pull request #6309 from joekr/add-CAPOCI-to-clusterctl

🌱 Add CAPOCI provider
kubernetes-sigs · Mar 18, 2022 · 692497d · 692497d
2 parents a026502 + 9e8e8ac
commit 692497d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 1 deletion.
diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go
@@ -45,6 +45,7 @@ const (
 	IBMCloudProviderName  = "ibmcloud"
 	Metal3ProviderName    = "metal3"
 	NestedProviderName    = "nested"
+	OCIProviderName       = "oci"
 	OpenStackProviderName = "openstack"
 	PacketProviderName    = "packet"
 	SideroProviderName    = "sidero"
@@ -155,6 +156,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/infrastructure-components.yaml",
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
+		&provider{
+			name:         OCIProviderName,
+			url:          "https://github.com/oracle/cluster-api-provider-oci/releases/latest/infrastructure-components.yaml",
+			providerType: clusterctlv1.InfrastructureProviderType,
+		},
 		&provider{
 			name:         OpenStackProviderName,
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/latest/infrastructure-components.yaml",

diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go
@@ -74,6 +74,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MAASProviderName,
 				config.Metal3ProviderName,
 				config.NestedProviderName,
+				config.OCIProviderName,
 				config.OpenStackProviderName,
 				config.PacketProviderName,
 				config.SideroProviderName,
@@ -108,6 +109,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.MAASProviderName,
 				config.Metal3ProviderName,
 				config.NestedProviderName,
+				config.OCIProviderName,
 				config.OpenStackProviderName,
 				config.PacketProviderName,
 				config.SideroProviderName,

diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go
@@ -121,6 +121,7 @@ maas                InfrastructureProvider   https://github.com/spectrocloud/clu
 metal3              InfrastructureProvider   https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/                    infrastructure-components.yaml
 my-infra-provider   InfrastructureProvider   /home/.cluster-api/overrides/infrastructure-docker/latest/                                   infrastructure-components.yaml
 nested              InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/              infrastructure-components.yaml
+oci                 InfrastructureProvider   https://github.com/oracle/cluster-api-provider-oci/releases/latest/                          infrastructure-components.yaml
 openstack           InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/latest/           infrastructure-components.yaml
 packet              InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-packet/releases/latest/              infrastructure-components.yaml
 sidero              InfrastructureProvider   https://github.com/talos-systems/sidero/releases/latest/                                     infrastructure-components.yaml
@@ -211,6 +212,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: nested
   ProviderType: InfrastructureProvider
   URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
+- File: infrastructure-components.yaml
+  Name: oci
+  ProviderType: InfrastructureProvider
+  URL: https://github.com/oracle/cluster-api-provider-oci/releases/latest/
 - File: infrastructure-components.yaml
   Name: openstack
   ProviderType: InfrastructureProvider

diff --git a/docs/book/src/clusterctl/provider-contract.md b/docs/book/src/clusterctl/provider-contract.md
@@ -198,6 +198,7 @@ providers.
 |CAPN          | cluster.x-k8s.io/provider=infrastructure-nested        |
 |CAPP          | cluster.x-k8s.io/provider=infrastructure-packet        |
 |CAPZ          | cluster.x-k8s.io/provider=infrastructure-azure         |
+|CAPOCI        | cluster.x-k8s.io/provider=infrastructure-oci           |
 |CAPO          | cluster.x-k8s.io/provider=infrastructure-openstack     |
 |CAPDO         | cluster.x-k8s.io/provider=infrastructure-digitalocean  |
 |CAPG          | cluster.x-k8s.io/provider=infrastructure-gcp           |

diff --git a/docs/book/src/reference/glossary.md b/docs/book/src/reference/glossary.md
@@ -59,6 +59,9 @@ Cluster API Provider Nested
 ### CAPO
 Cluster API Provider OpenStack
 
+### CAPOCI
+Cluster API Provider Oracle Cloud Infrastructure (OCI)
+
 ### CAPV
 Cluster API Provider vSphere
 

diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md
@@ -202,7 +202,7 @@ Additional documentation about experimental features can be found in [Experiment
 Depending on the infrastructure provider you are planning to use, some additional prerequisites should be satisfied
 before getting started with Cluster API. See below for the expected settings for common providers.
 
-{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,OpenStack,vSphere"}}
+{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,DigitalOcean,Docker,Equinix Metal,GCP,Hetzner,Metal3,OCI,OpenStack,vSphere"}}
 {{#tab AWS}}
 
 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].
 
 Please visit the [Metal3 project][Metal3 provider].
 
+{{#/tab }}
+{{#tab OCI}}
+
+Please follow the Cluster API Provider for [Oracle Cloud Infrastructure (OCI) Getting Started Guide][oci-provider]
+
 {{#/tab }}
 {{#tab OpenStack}}
 
@@ -854,6 +859,7 @@ See the [clusterctl] documentation for more detail about clusterctl supported ac
 [management cluster]: ../reference/glossary.md#management-cluster
 [Metal3 getting started guide]: https://github.com/metal3-io/cluster-api-provider-metal3/blob/master/docs/getting-started.md
 [Metal3 provider]: https://github.com/metal3-io/cluster-api-provider-metal3/
+[oci-provider]: https://oracle.github.io/cluster-api-provider-oci/#getting-started
 [Equinix Metal getting started guide]: https://github.com/kubernetes-sigs/cluster-api-provider-packet#using
 [provider]:../reference/providers.md
 [provider components]: ../reference/glossary.md#provider-components