Skip to content

Commit 4bb1961

Browse files
authored
Merge pull request #5640 from mkumatag/ibmcloud
✨ Add ibmcloud provider support
2 parents 4cc2fce + 820123a commit 4bb1961

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed

cmd/clusterctl/client/config/providers_client.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const (
3939
DockerProviderName = "docker"
4040
DOProviderName = "digitalocean"
4141
GCPProviderName = "gcp"
42+
IBMCloudProviderName = "ibmcloud"
4243
Metal3ProviderName = "metal3"
4344
NestedProviderName = "nested"
4445
OpenStackProviderName = "openstack"
@@ -175,6 +176,11 @@ func (p *providersClient) defaults() []Provider {
175176
url: "https://github.com/vmware-tanzu/cluster-api-provider-bringyourownhost/releases/latest/infrastructure-components.yaml",
176177
providerType: clusterctlv1.InfrastructureProviderType,
177178
},
179+
&provider{
180+
name: IBMCloudProviderName,
181+
url: "https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/infrastructure-components.yaml",
182+
providerType: clusterctlv1.InfrastructureProviderType,
183+
},
178184

179185
// Bootstrap providers
180186
&provider{

cmd/clusterctl/client/config_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
6868
config.DOProviderName,
6969
config.DockerProviderName,
7070
config.GCPProviderName,
71+
config.IBMCloudProviderName,
7172
config.MAASProviderName,
7273
config.Metal3ProviderName,
7374
config.NestedProviderName,
@@ -100,6 +101,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
100101
config.DOProviderName,
101102
config.DockerProviderName,
102103
config.GCPProviderName,
104+
config.IBMCloudProviderName,
103105
config.MAASProviderName,
104106
config.Metal3ProviderName,
105107
config.NestedProviderName,

cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ byoh InfrastructureProvider https://github.com/vmware-tanzu/clu
115115
digitalocean InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean/releases/latest/ infrastructure-components.yaml
116116
docker InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ infrastructure-components-development.yaml
117117
gcp InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/latest/ infrastructure-components.yaml
118+
ibmcloud InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/ infrastructure-components.yaml
118119
maas InfrastructureProvider https://github.com/spectrocloud/cluster-api-provider-maas/releases/latest/ infrastructure-components.yaml
119120
metal3 InfrastructureProvider https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/ infrastructure-components.yaml
120121
my-infra-provider InfrastructureProvider /home/.cluster-api/overrides/infrastructure-docker/latest/ infrastructure-components.yaml
@@ -185,6 +186,10 @@ var expectedOutputYaml = `- File: core_components.yaml
185186
Name: gcp
186187
ProviderType: InfrastructureProvider
187188
URL: https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/latest/
189+
- File: infrastructure-components.yaml
190+
Name: ibmcloud
191+
ProviderType: InfrastructureProvider
192+
URL: https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/
188193
- File: infrastructure-components.yaml
189194
Name: maas
190195
ProviderType: InfrastructureProvider

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ providers.
190190
|CACPN | cluster.x-k8s.io/provider=control-plane-nested |
191191
|CAPA | cluster.x-k8s.io/provider=infrastructure-aws |
192192
|CAPB | cluster.x-k8s.io/provider=infrastructure-byoh |
193+
|CAPIBM | cluster.x-k8s.io/provider=infrastructure-ibmcloud |
193194
|CAPV | cluster.x-k8s.io/provider=infrastructure-vsphere |
194195
|CAPD | cluster.x-k8s.io/provider=infrastructure-docker |
195196
|CAPM3 | cluster.x-k8s.io/provider=infrastructure-metal3 |

0 commit comments

Comments
 (0)