Skip to content

Commit 3f03a5c

Browse files
theabmitratheabmitra
authored
🌱 Add CABPOCNE and CACPOCNE Providers (#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
1 parent 4815b12 commit 3f03a5c

File tree

6 files changed

+45
-9
lines changed

6 files changed

+45
-9
lines changed

‎cmd/clusterctl/client/config/providers_client.go

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,21 @@ const (
6767

6868
// Bootstrap providers.
6969
const (
70-
KubeadmBootstrapProviderName = "kubeadm"
71-
TalosBootstrapProviderName = "talos"
72-
MicroK8sBootstrapProviderName = "microk8s"
73-
KubeKeyK3sBootstrapProviderName = "kubekey-k3s"
70+
KubeadmBootstrapProviderName = "kubeadm"
71+
TalosBootstrapProviderName = "talos"
72+
MicroK8sBootstrapProviderName = "microk8s"
73+
OracleCloudNativeBootstrapProviderName = "ocne"
74+
KubeKeyK3sBootstrapProviderName = "kubekey-k3s"
7475
)
7576

7677
// ControlPlane providers.
7778
const (
78-
KubeadmControlPlaneProviderName = "kubeadm"
79-
TalosControlPlaneProviderName = "talos"
80-
MicroK8sControlPlaneProviderName = "microk8s"
81-
NestedControlPlaneProviderName = "nested"
82-
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
79+
KubeadmControlPlaneProviderName = "kubeadm"
80+
TalosControlPlaneProviderName = "talos"
81+
MicroK8sControlPlaneProviderName = "microk8s"
82+
NestedControlPlaneProviderName = "nested"
83+
OracleCloudNativeControlPlaneProviderName = "ocne"
84+
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
8385
)
8486

8587
// Add-on providers.
@@ -287,6 +289,11 @@ func (p *providersClient) defaults() []Provider {
287289
url: "https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/bootstrap-components.yaml",
288290
providerType: clusterctlv1.BootstrapProviderType,
289291
},
292+
&provider{
293+
name: OracleCloudNativeBootstrapProviderName,
294+
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/bootstrap-components.yaml",
295+
providerType: clusterctlv1.BootstrapProviderType,
296+
},
290297

291298
// ControlPlane providers
292299
&provider{
@@ -314,6 +321,11 @@ func (p *providersClient) defaults() []Provider {
314321
url: "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/control-plane-components.yaml",
315322
providerType: clusterctlv1.ControlPlaneProviderType,
316323
},
324+
&provider{
325+
name: OracleCloudNativeControlPlaneProviderName,
326+
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/control-plane-components.yaml",
327+
providerType: clusterctlv1.ControlPlaneProviderType,
328+
},
317329

318330
// Add-on providers
319331
&provider{

‎cmd/clusterctl/client/config_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,13 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
5959
config.KubeadmBootstrapProviderName,
6060
config.KubeKeyK3sBootstrapProviderName,
6161
config.MicroK8sBootstrapProviderName,
62+
config.OracleCloudNativeBootstrapProviderName,
6263
config.TalosBootstrapProviderName,
6364
config.KubeadmControlPlaneProviderName,
6465
config.KubeKeyK3sControlPlaneProviderName,
6566
config.MicroK8sControlPlaneProviderName,
6667
config.NestedControlPlaneProviderName,
68+
config.OracleCloudNativeControlPlaneProviderName,
6769
config.TalosControlPlaneProviderName,
6870
config.AWSProviderName,
6971
config.AzureProviderName,
@@ -107,11 +109,13 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
107109
config.KubeadmBootstrapProviderName,
108110
config.KubeKeyK3sBootstrapProviderName,
109111
config.MicroK8sBootstrapProviderName,
112+
config.OracleCloudNativeBootstrapProviderName,
110113
config.TalosBootstrapProviderName,
111114
config.KubeadmControlPlaneProviderName,
112115
config.KubeKeyK3sControlPlaneProviderName,
113116
config.MicroK8sControlPlaneProviderName,
114117
config.NestedControlPlaneProviderName,
118+
config.OracleCloudNativeControlPlaneProviderName,
115119
config.TalosControlPlaneProviderName,
116120
config.AWSProviderName,
117121
config.AzureProviderName,

‎cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,13 @@ another-provider BootstrapProvider ./
108108
kubeadm BootstrapProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ bootstrap-components.yaml
109109
kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubekey/releases/latest/ bootstrap-components.yaml
110110
microk8s BootstrapProvider https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/ bootstrap-components.yaml
111+
ocne BootstrapProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ bootstrap-components.yaml
111112
talos BootstrapProvider https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml
112113
kubeadm ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ control-plane-components.yaml
113114
kubekey-k3s ControlPlaneProvider https://github.com/kubesphere/kubekey/releases/latest/ control-plane-components.yaml
114115
microk8s ControlPlaneProvider https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/ control-plane-components.yaml
115116
nested ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ control-plane-components.yaml
117+
ocne ControlPlaneProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ control-plane-components.yaml
116118
talos ControlPlaneProvider https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/ control-plane-components.yaml
117119
aws InfrastructureProvider my-aws-infrastructure-components.yaml
118120
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
164166
Name: microk8s
165167
ProviderType: BootstrapProvider
166168
URL: https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/
169+
- File: bootstrap-components.yaml
170+
Name: ocne
171+
ProviderType: BootstrapProvider
172+
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
167173
- File: bootstrap-components.yaml
168174
Name: talos
169175
ProviderType: BootstrapProvider
@@ -184,6 +190,10 @@ var expectedOutputYaml = `- File: core_components.yaml
184190
Name: nested
185191
ProviderType: ControlPlaneProvider
186192
URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
193+
- File: control-plane-components.yaml
194+
Name: ocne
195+
ProviderType: ControlPlaneProvider
196+
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
187197
- File: control-plane-components.yaml
188198
Name: talos
189199
ProviderType: ControlPlaneProvider

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,12 @@ providers.
251251
| CABPK | cluster.x-k8s.io/provider=bootstrap-kubeadm |
252252
| CABPM | cluster.x-k8s.io/provider=bootstrap-microk8s |
253253
| CABPKK3S | cluster.x-k8s.io/provider=bootstrap-kubekey-k3s |
254+
| CABPOCNE | cluster.x-k8s.io/provider=bootstrap-ocne |
254255
| CACPK | cluster.x-k8s.io/provider=control-plane-kubeadm |
255256
| CACPM | cluster.x-k8s.io/provider=control-plane-microk8s |
256257
| CACPN | cluster.x-k8s.io/provider=control-plane-nested |
257258
| CACPKK3S | cluster.x-k8s.io/provider=control-plane-kubekey-k3s |
259+
| CACPOCNE | cluster.x-k8s.io/provider=control-plane-ocne |
258260
| CAPA | cluster.x-k8s.io/provider=infrastructure-aws |
259261
| CAPB | cluster.x-k8s.io/provider=infrastructure-byoh |
260262
| CAPC | cluster.x-k8s.io/provider=infrastructure-cloudstack |

‎docs/book/src/reference/glossary.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ Cluster API Provider AWS
4545
### CABPK
4646
Cluster API Bootstrap Provider Kubeadm
4747

48+
### CABPOCNE
49+
Cluster API Bootstrap Provider Oracle Cloud Native Environment (OCNE)
50+
51+
### CACPOCNE
52+
Cluster API Control Plane Provider Oracle Cloud Native Environment (OCNE)
53+
4854
### CAPC
4955
Cluster API Provider CloudStack
5056

‎docs/book/src/reference/providers.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ updated info about which API version they are supporting.
99
- [Amazon Elastic Kubernetes Service (EKS)](https://github.com/kubernetes-sigs/cluster-api-provider-aws/tree/main/bootstrap/eks)
1010
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm)
1111
- [MicroK8s](https://github.com/canonical/cluster-api-bootstrap-provider-microk8s)
12+
- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
1213
- [Talos](https://github.com/siderolabs/cluster-api-bootstrap-provider-talos)
1314

1415
## Control Plane
1516
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm)
1617
- [MicroK8s](https://github.com/canonical/cluster-api-control-plane-provider-microk8s)
1718
- [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
19+
- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
1820
- [Talos](https://github.com/siderolabs/cluster-api-control-plane-provider-talos)
1921

2022
## Infrastructure

0 commit comments

Comments
 (0)