Skip to content

Commit 2887be8

Browse files
authored
Merge pull request #5646 from mkumatag/release-1.0-ibmcloud
✨ Add ibmcloud provider support
2 parents 17d82bb + aad4b5c commit 2887be8

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
@@ -38,6 +38,7 @@ const (
3838
DockerProviderName = "docker"
3939
DOProviderName = "digitalocean"
4040
GCPProviderName = "gcp"
41+
IBMCloudProviderName = "ibmcloud"
4142
Metal3ProviderName = "metal3"
4243
NestedProviderName = "nested"
4344
OpenStackProviderName = "openstack"
@@ -169,6 +170,11 @@ func (p *providersClient) defaults() []Provider {
169170
url: "https://github.com/spectrocloud/cluster-api-provider-maas/releases/latest/infrastructure-components.yaml",
170171
providerType: clusterctlv1.InfrastructureProviderType,
171172
},
173+
&provider{
174+
name: IBMCloudProviderName,
175+
url: "https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/infrastructure-components.yaml",
176+
providerType: clusterctlv1.InfrastructureProviderType,
177+
},
172178

173179
// Bootstrap providers
174180
&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,
@@ -99,6 +100,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
99100
config.DOProviderName,
100101
config.DockerProviderName,
101102
config.GCPProviderName,
103+
config.IBMCloudProviderName,
102104
config.MAASProviderName,
103105
config.Metal3ProviderName,
104106
config.NestedProviderName,

cmd/clusterctl/cmd/config_repositories_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ azure InfrastructureProvider https://github.com/kubernetes-sigs/
114114
digitalocean InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean/releases/latest/ infrastructure-components.yaml
115115
docker InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ infrastructure-components-development.yaml
116116
gcp InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/latest/ infrastructure-components.yaml
117+
ibmcloud InfrastructureProvider https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/ infrastructure-components.yaml
117118
maas InfrastructureProvider https://github.com/spectrocloud/cluster-api-provider-maas/releases/latest/ infrastructure-components.yaml
118119
metal3 InfrastructureProvider https://github.com/metal3-io/cluster-api-provider-metal3/releases/latest/ infrastructure-components.yaml
119120
my-infra-provider InfrastructureProvider /home/.cluster-api/overrides/infrastructure-docker/latest/ infrastructure-components.yaml
@@ -180,6 +181,10 @@ var expectedOutputYaml = `- File: core_components.yaml
180181
Name: gcp
181182
ProviderType: InfrastructureProvider
182183
URL: https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/latest/
184+
- File: infrastructure-components.yaml
185+
Name: ibmcloud
186+
ProviderType: InfrastructureProvider
187+
URL: https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud/releases/latest/
183188
- File: infrastructure-components.yaml
184189
Name: maas
185190
ProviderType: InfrastructureProvider

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ providers.
185185
|CACPK | cluster.x-k8s.io/provider=control-plane-kubeadm |
186186
|CACPN | cluster.x-k8s.io/provider=control-plane-nested |
187187
|CAPA | cluster.x-k8s.io/provider=infrastructure-aws |
188+
|CAPIBM | cluster.x-k8s.io/provider=infrastructure-ibmcloud |
188189
|CAPV | cluster.x-k8s.io/provider=infrastructure-vsphere |
189190
|CAPD | cluster.x-k8s.io/provider=infrastructure-docker |
190191
|CAPM3 | cluster.x-k8s.io/provider=infrastructure-metal3 |

0 commit comments

Comments
 (0)