Skip to content

Commit 9a55766

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11830 from sbueringer/pr-remove-ocne-providers
🌱 Remove OCNE providers
2 parents 7ca573b + 499e097 commit 9a55766

File tree

6 files changed

+0
-36
lines changed

6 files changed

+0
-36
lines changed

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

-12
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ const (
7979
KubeadmBootstrapProviderName = "kubeadm"
8080
TalosBootstrapProviderName = "talos"
8181
MicroK8sBootstrapProviderName = "microk8s"
82-
OracleCloudNativeBootstrapProviderName = "ocne"
8382
KubeKeyK3sBootstrapProviderName = "kubekey-k3s"
8483
RKE2BootstrapProviderName = "rke2"
8584
K0smotronBootstrapProviderName = "k0sproject-k0smotron"
@@ -92,7 +91,6 @@ const (
9291
TalosControlPlaneProviderName = "talos"
9392
MicroK8sControlPlaneProviderName = "microk8s"
9493
NestedControlPlaneProviderName = "nested"
95-
OracleCloudNativeControlPlaneProviderName = "ocne"
9694
KubeKeyK3sControlPlaneProviderName = "kubekey-k3s"
9795
KamajiControlPlaneProviderName = "kamaji"
9896
RKE2ControlPlaneProviderName = "rke2"
@@ -357,11 +355,6 @@ func (p *providersClient) defaults() []Provider {
357355
url: "https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/bootstrap-components.yaml",
358356
providerType: clusterctlv1.BootstrapProviderType,
359357
},
360-
&provider{
361-
name: OracleCloudNativeBootstrapProviderName,
362-
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/bootstrap-components.yaml",
363-
providerType: clusterctlv1.BootstrapProviderType,
364-
},
365358
&provider{
366359
name: RKE2BootstrapProviderName,
367360
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/latest/bootstrap-components.yaml",
@@ -404,11 +397,6 @@ func (p *providersClient) defaults() []Provider {
404397
url: "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/control-plane-components.yaml",
405398
providerType: clusterctlv1.ControlPlaneProviderType,
406399
},
407-
&provider{
408-
name: OracleCloudNativeControlPlaneProviderName,
409-
url: "https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/control-plane-components.yaml",
410-
providerType: clusterctlv1.ControlPlaneProviderType,
411-
},
412400
&provider{
413401
name: KamajiControlPlaneProviderName,
414402
url: "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/latest/control-plane-components.yaml",

‎cmd/clusterctl/client/config_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
6262
config.KubeadmBootstrapProviderName,
6363
config.KubeKeyK3sBootstrapProviderName,
6464
config.MicroK8sBootstrapProviderName,
65-
config.OracleCloudNativeBootstrapProviderName,
6665
config.RKE2BootstrapProviderName,
6766
config.TalosBootstrapProviderName,
6867
config.CanonicalKubernetesControlPlaneProviderName,
@@ -72,7 +71,6 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
7271
config.KubeKeyK3sControlPlaneProviderName,
7372
config.MicroK8sControlPlaneProviderName,
7473
config.NestedControlPlaneProviderName,
75-
config.OracleCloudNativeControlPlaneProviderName,
7674
config.RKE2ControlPlaneProviderName,
7775
config.TalosControlPlaneProviderName,
7876
config.AWSProviderName,
@@ -131,7 +129,6 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
131129
config.KubeadmBootstrapProviderName,
132130
config.KubeKeyK3sBootstrapProviderName,
133131
config.MicroK8sBootstrapProviderName,
134-
config.OracleCloudNativeBootstrapProviderName,
135132
config.RKE2BootstrapProviderName,
136133
config.TalosBootstrapProviderName,
137134
config.CanonicalKubernetesControlPlaneProviderName,
@@ -141,7 +138,6 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
141138
config.KubeKeyK3sControlPlaneProviderName,
142139
config.MicroK8sControlPlaneProviderName,
143140
config.NestedControlPlaneProviderName,
144-
config.OracleCloudNativeControlPlaneProviderName,
145141
config.RKE2ControlPlaneProviderName,
146142
config.TalosControlPlaneProviderName,
147143
config.AWSProviderName,

‎cmd/clusterctl/cmd/config_repositories_test.go

-10
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ k0sproject-k0smotron BootstrapProvider https://github.com/k0sproject
109109
kubeadm BootstrapProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ bootstrap-components.yaml
110110
kubekey-k3s BootstrapProvider https://github.com/kubesphere/kubekey/releases/latest/ bootstrap-components.yaml
111111
microk8s BootstrapProvider https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/ bootstrap-components.yaml
112-
ocne BootstrapProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ bootstrap-components.yaml
113112
rke2 BootstrapProvider https://github.com/rancher/cluster-api-provider-rke2/releases/latest/ bootstrap-components.yaml
114113
talos BootstrapProvider https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml
115114
canonical-kubernetes ControlPlaneProvider https://github.com/canonical/cluster-api-k8s/releases/latest/ control-plane-components.yaml
@@ -119,7 +118,6 @@ kubeadm ControlPlaneProvider https://github.com/kubernetes
119118
kubekey-k3s ControlPlaneProvider https://github.com/kubesphere/kubekey/releases/latest/ control-plane-components.yaml
120119
microk8s ControlPlaneProvider https://github.com/canonical/cluster-api-control-plane-provider-microk8s/releases/latest/ control-plane-components.yaml
121120
nested ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ control-plane-components.yaml
122-
ocne ControlPlaneProvider https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/ control-plane-components.yaml
123121
rke2 ControlPlaneProvider https://github.com/rancher/cluster-api-provider-rke2/releases/latest/ control-plane-components.yaml
124122
talos ControlPlaneProvider https://github.com/siderolabs/cluster-api-control-plane-provider-talos/releases/latest/ control-plane-components.yaml
125123
aws InfrastructureProvider my-aws-infrastructure-components.yaml
@@ -192,10 +190,6 @@ var expectedOutputYaml = `- File: core_components.yaml
192190
Name: microk8s
193191
ProviderType: BootstrapProvider
194192
URL: https://github.com/canonical/cluster-api-bootstrap-provider-microk8s/releases/latest/
195-
- File: bootstrap-components.yaml
196-
Name: ocne
197-
ProviderType: BootstrapProvider
198-
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
199193
- File: bootstrap-components.yaml
200194
Name: rke2
201195
ProviderType: BootstrapProvider
@@ -232,10 +226,6 @@ var expectedOutputYaml = `- File: core_components.yaml
232226
Name: nested
233227
ProviderType: ControlPlaneProvider
234228
URL: https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/
235-
- File: control-plane-components.yaml
236-
Name: ocne
237-
ProviderType: ControlPlaneProvider
238-
URL: https://github.com/verrazzano/cluster-api-provider-ocne/releases/latest/
239229
- File: control-plane-components.yaml
240230
Name: rke2
241231
ProviderType: ControlPlaneProvider

‎docs/book/src/developer/providers/contracts/clusterctl.md

-2
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,11 @@ providers.
312312
| CABPK | cluster.x-k8s.io/provider=bootstrap-kubeadm |
313313
| CABPM | cluster.x-k8s.io/provider=bootstrap-microk8s |
314314
| CABPKK3S | cluster.x-k8s.io/provider=bootstrap-kubekey-k3s |
315-
| CABPOCNE | cluster.x-k8s.io/provider=bootstrap-ocne |
316315
| CABPK0S | cluster.x-k8s.io/provider=bootstrap-k0smotron |
317316
| CACPK | cluster.x-k8s.io/provider=control-plane-kubeadm |
318317
| CACPM | cluster.x-k8s.io/provider=control-plane-microk8s |
319318
| CACPN | cluster.x-k8s.io/provider=control-plane-nested |
320319
| CACPKK3S | cluster.x-k8s.io/provider=control-plane-kubekey-k3s |
321-
| CACPOCNE | cluster.x-k8s.io/provider=control-plane-ocne |
322320
| CACPK0S | cluster.x-k8s.io/provider=control-plane-k0smotron |
323321
| CAPA | cluster.x-k8s.io/provider=infrastructure-aws |
324322
| CAPB | cluster.x-k8s.io/provider=infrastructure-byoh |

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

-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ 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-
5448
### CAPC
5549
Cluster API Provider CloudStack
5650

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

-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ updated info about which API version they are supporting.
1212
- [K3s](https://github.com/cluster-api-provider-k3s/cluster-api-k3s)
1313
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/bootstrap/kubeadm)
1414
- [MicroK8s](https://github.com/canonical/cluster-api-bootstrap-provider-microk8s)
15-
- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
1615
- [RKE2](https://github.com/rancher/cluster-api-provider-rke2)
1716
- [Talos](https://github.com/siderolabs/cluster-api-bootstrap-provider-talos)
1817

@@ -24,7 +23,6 @@ updated info about which API version they are supporting.
2423
- [Kubeadm](https://github.com/kubernetes-sigs/cluster-api/tree/main/controlplane/kubeadm)
2524
- [MicroK8s](https://github.com/canonical/cluster-api-control-plane-provider-microk8s)
2625
- [Nested](https://github.com/kubernetes-sigs/cluster-api-provider-nested)
27-
- [Oracle Cloud Native Environment (OCNE)](https://github.com/verrazzano/cluster-api-provider-ocne)
2826
- [RKE2](https://github.com/rancher/cluster-api-provider-rke2)
2927
- [Talos](https://github.com/siderolabs/cluster-api-control-plane-provider-talos)
3028

0 commit comments

Comments
 (0)