🌱 Add CABPOCNE and CACPOCNE Providers (kubernetes-sigs#9012)

* OCNE bootstrap and control plane changes

* fix line spaces

* reimport gomega

* reimport gomega in config test

* Rearrange OCNE to alphabetical and add more test data

* Rename variable name OCNEBootstrapProviderName to OracleCloudNativeBootstrapProviderName

Author: theabmitra

cmd/clusterctl/client/config/providers_client.go

@@ -67,19 +67,21 @@ const (
 
 // Bootstrap providers.
 const (
-	KubeadmBootstrapProviderName    = "kubeadm"
-	TalosBootstrapProviderName      = "talos"
-	MicroK8sBootstrapProviderName   = "microk8s"
-	KubeKeyK3sBootstrapProviderName = "kubekey-k3s"
+	KubeadmBootstrapProviderName           = "kubeadm"
+	TalosBootstrapProviderName             = "talos"
+	MicroK8sBootstrapProviderName          = "microk8s"
+	OracleCloudNativeBootstrapProviderName = "ocne"
+	KubeKeyK3sBootstrapProviderName        = "kubekey-k3s"
 )
 
 // ControlPlane providers.
 const (
-	KubeadmControlPlaneProviderName    = "kubeadm"
-	TalosControlPlaneProviderName      = "talos"
-	MicroK8sControlPlaneProviderName   = "microk8s"
-	NestedControlPlaneProviderName     = "nested"
-	KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
+	KubeadmControlPlaneProviderName           = "kubeadm"
+	TalosControlPlaneProviderName             = "talos"
+	MicroK8sControlPlaneProviderName          = "microk8s"
+	NestedControlPlaneProviderName            = "nested"
+	OracleCloudNativeControlPlaneProviderName = "ocne"
+	KubeKeyK3sControlPlaneProviderName        = "kubekey-k3s"
 )
 
 // Add-on providers.
@@ -287,6 +289,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/bootstrap-components.yaml",
 			providerType: clusterctlv1.BootstrapProviderType,
 		},
+		&provider{
+			name:         OracleCloudNativeBootstrapProviderName,
+			url:          "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/bootstrap-components.yaml",
+			providerType: clusterctlv1.BootstrapProviderType,
+		},
 
 		// ControlPlane providers
 		&provider{
@@ -314,6 +321,11 @@ func (p *providersClient) defaults() []Provider {
 			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/control-plane-components.yaml",
 			providerType: clusterctlv1.ControlPlaneProviderType,
 		},
+		&provider{
+			name:         OracleCloudNativeControlPlaneProviderName,
+			url:          "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/control-plane-components.yaml",
+			providerType: clusterctlv1.ControlPlaneProviderType,
+		},
 
 		// Add-on providers
 		&provider{

cmd/clusterctl/client/config_test.go

@@ -59,11 +59,13 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.KubeadmBootstrapProviderName,
 				config.KubeKeyK3sBootstrapProviderName,
 				config.MicroK8sBootstrapProviderName,
+				config.OracleCloudNativeBootstrapProviderName,
 				config.TalosBootstrapProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.KubeKeyK3sControlPlaneProviderName,
 				config.MicroK8sControlPlaneProviderName,
 				config.NestedControlPlaneProviderName,
+				config.OracleCloudNativeControlPlaneProviderName,
 				config.TalosControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,
@@ -107,11 +109,13 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.KubeadmBootstrapProviderName,
 				config.KubeKeyK3sBootstrapProviderName,
 				config.MicroK8sBootstrapProviderName,
+				config.OracleCloudNativeBootstrapProviderName,
 				config.TalosBootstrapProviderName,
 				config.KubeadmControlPlaneProviderName,
 				config.KubeKeyK3sControlPlaneProviderName,
 				config.MicroK8sControlPlaneProviderName,
 				config.NestedControlPlaneProviderName,
+				config.OracleCloudNativeControlPlaneProviderName,
 				config.TalosControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,

cmd/clusterctl/cmd/config_repositories_test.go

@@ -108,11 +108,13 @@ another-provider    BootstrapProvider        ./
 kubeadm             BootstrapProvider        https://github.com/kubernetes-sigs/cluster-api/releases/latest/                             bootstrap-components.yaml
 kubekey-k3s         BootstrapProvider        https://github.com/kubesphere/kubekey/releases/latest/                                      bootstrap-components.yaml
 microk8s            BootstrapProvider        https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/       bootstrap-components.yaml
+ocne                BootstrapProvider        https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/                    bootstrap-components.yaml
 talos               BootstrapProvider        https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/         bootstrap-components.yaml
 kubeadm             ControlPlaneProvider     https://github.com/kubernetes-sigs/cluster-api/releases/latest/                             control-plane-components.yaml
 kubekey-k3s         ControlPlaneProvider     https://github.com/kubesphere/kubekey/releases/latest/                                      control-plane-components.yaml
 microk8s            ControlPlaneProvider     https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/   control-plane-components.yaml
 nested              ControlPlaneProvider     https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/             control-plane-components.yaml
+ocne                ControlPlaneProvider     https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/                    control-plane-components.yaml
 talos               ControlPlaneProvider     https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/     control-plane-components.yaml
 aws                 InfrastructureProvider                                                                                               my-aws-infrastructure-components.yaml
 azure               InfrastructureProvider   https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/latest/              infrastructure-components.yaml
@@ -164,6 +166,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: microk8s
   ProviderType: BootstrapProvider
   URL: https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/
+- File: bootstrap-components.yaml
+  Name: ocne
+  ProviderType: BootstrapProvider
+  URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
 - File: bootstrap-components.yaml
   Name: talos
   ProviderType: BootstrapProvider
@@ -184,6 +190,10 @@ var expectedOutputYaml = `- File: core_components.yaml
   Name: nested
   ProviderType: ControlPlaneProvider
   URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
+- File: control-plane-components.yaml
+  Name: ocne
+  ProviderType: ControlPlaneProvider
+  URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
 - File: control-plane-components.yaml
   Name: talos
   ProviderType: ControlPlaneProvider

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

@@ -251,10 +251,12 @@ providers.
 | CABPK         | cluster.x-k8s.io/provider=bootstrap-kubeadm           |
 | CABPM         | cluster.x-k8s.io/provider=bootstrap-microk8s          |
 | CABPKK3S      | cluster.x-k8s.io/provider=bootstrap-kubekey-k3s       |
+| CABPOCNE      | cluster.x-k8s.io/provider=bootstrap-ocne              |
 | CACPK         | cluster.x-k8s.io/provider=control-plane-kubeadm       |
 | CACPM         | cluster.x-k8s.io/provider=control-plane-microk8s      |
 | CACPN         | cluster.x-k8s.io/provider=control-plane-nested        |
 | CACPKK3S      | cluster.x-k8s.io/provider=control-plane-kubekey-k3s   |
+| CACPOCNE      | cluster.x-k8s.io/provider=control-plane-ocne          |
 | CAPA          | cluster.x-k8s.io/provider=infrastructure-aws          |
 | CAPB          | cluster.x-k8s.io/provider=infrastructure-byoh         |
 | CAPC          | cluster.x-k8s.io/provider=infrastructure-cloudstack   |

docs/book/src/reference/glossary.md

@@ -45,6 +45,12 @@ Cluster API Provider AWS
 ### CABPK
 Cluster API Bootstrap Provider Kubeadm
 
+### CABPOCNE
+Cluster API Bootstrap Provider Oracle Cloud Native Environment (OCNE)
+
+### CACPOCNE
+Cluster API Control Plane Provider Oracle Cloud Native Environment (OCNE)
+
 ### CAPC
 Cluster API Provider CloudStack
 

docs/book/src/reference/providers.md

@@ -9,12 +9,14 @@ updated info about which API version they are supporting.
 - [Amazon Elastic Kubernetes Service (EKS)](https://github.com/kubernetes-sigs/cluster-api-provider-aws/tree/main/bootstrap/eks)
 - [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm)
 - [MicroK8s](https://github.com/canonical/cluster-api-bootstrap-provider-microk8s)
+- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
 - [Talos](https://github.com/siderolabs/cluster-api-bootstrap-provider-talos)
 
 ## Control Plane
 - [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm)
 - [MicroK8s](https://github.com/canonical/cluster-api-control-plane-provider-microk8s)
 - [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
+- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
 - [Talos](https://github.com/siderolabs/cluster-api-control-plane-provider-talos)
 
 ## Infrastructure