Rename Metal3.io provider from Baremetal to Metal3

kubernetes-sigs · Feb 27, 2020 · 15ff119 · 15ff119
1 parent f0bc103
commit 15ff119
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/cmd/clusterctl/pkg/client/config/providers_client.go b/cmd/clusterctl/pkg/client/config/providers_client.go
@@ -32,8 +32,8 @@ const (
 	KubeadmControlPlaneProviderName = "kubeadm"
 	AWSProviderName                 = "aws"
 	AzureProviderName               = "azure"
-	BareMetalProviderName           = "baremetal"
 	DockerProviderName              = "docker"
+	Metal3ProviderName              = "metal3"
 	OpenStackProviderName           = "openstack"
 	VSphereProviderName             = "vsphere"
 	ProvidersConfigKey              = "providers"
@@ -91,13 +91,13 @@ func (p *providersClient) defaults() []Provider {
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
 		&provider{
-			name:         BareMetalProviderName,
-			url:          "https://github.com/metal3-io/cluster-api-provider-baremetal/releases/latest/infrastructure-components.yaml",
+			name:         DockerProviderName,
+			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-docker/releases/latest/infrastructure-components.yaml",
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
 		&provider{
-			name:         DockerProviderName,
-			url:          "https://github.com/kubernetes-sigs/cluster-api-provider-docker/releases/latest/infrastructure-components.yaml",
+			name:         Metal3ProviderName,
+			url:          "https://github.com/metal3-io/cluster-api-provider-baremetal/releases/latest/infrastructure-components.yaml",
 			providerType: clusterctlv1.InfrastructureProviderType,
 		},
 		&provider{

diff --git a/cmd/clusterctl/pkg/client/config_test.go b/cmd/clusterctl/pkg/client/config_test.go
@@ -53,8 +53,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.KubeadmControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,
-				config.BareMetalProviderName,
 				config.DockerProviderName,
+				config.Metal3ProviderName,
 				config.OpenStackProviderName,
 				config.VSphereProviderName,
 			},
@@ -72,8 +72,8 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
 				config.KubeadmControlPlaneProviderName,
 				config.AWSProviderName,
 				config.AzureProviderName,
-				config.BareMetalProviderName,
 				config.DockerProviderName,
+				config.Metal3ProviderName,
 				config.OpenStackProviderName,
 				config.VSphereProviderName,
 			},

diff --git a/cmd/clusterctl/pkg/client/repository/metadata_client.go b/cmd/clusterctl/pkg/client/repository/metadata_client.go
@@ -185,31 +185,31 @@ func (f *metadataClient) getEmbeddedMetadata() *clusterctlv1.Metadata {
 					// older version are not supported by clusterctl
 				},
 			}
-		case config.BareMetalProviderName:
+		case config.DockerProviderName:
 			return &clusterctlv1.Metadata{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: clusterctlv1.GroupVersion.String(),
 					Kind:       "Metadata",
 				},
 				ReleaseSeries: []clusterctlv1.ReleaseSeries{
 					// v1alpha3 release series
-					{Major: 0, Minor: 3, Contract: "v1alpha3"},
+					{Major: 0, Minor: 3, Contract: "v1alpha3"}, // From this release series CAPD version scheme is linked to CAPI
 					// v1alpha2 release series are supported only for upgrades
-					{Major: 0, Minor: 2, Contract: "v1alpha2"},
+					{Major: 0, Minor: 2, Contract: "v1alpha2"}, // This release was hosted on a different repository
 					// older version are not supported by clusterctl
 				},
 			}
-		case config.DockerProviderName:
+		case config.Metal3ProviderName:
 			return &clusterctlv1.Metadata{
 				TypeMeta: metav1.TypeMeta{
 					APIVersion: clusterctlv1.GroupVersion.String(),
 					Kind:       "Metadata",
 				},
 				ReleaseSeries: []clusterctlv1.ReleaseSeries{
 					// v1alpha3 release series
-					{Major: 0, Minor: 3, Contract: "v1alpha3"}, // From this release series CAPD version scheme is linked to CAPI
+					{Major: 0, Minor: 3, Contract: "v1alpha3"},
 					// v1alpha2 release series are supported only for upgrades
-					{Major: 0, Minor: 2, Contract: "v1alpha2"}, // This release was hosted on a different repository
+					{Major: 0, Minor: 2, Contract: "v1alpha2"},
 					// older version are not supported by clusterctl
 				},
 			}

diff --git a/docs/book/src/clusterctl/overview.md b/docs/book/src/clusterctl/overview.md
@@ -74,7 +74,7 @@ export KUBECONFIG=<...>
 * If the provider of your choice expects some environment variables, e.g. `AWS_CREDENTIALS` for the `aws`
 infrastructure provider, user should ensure those variables are set in advance.
 
-{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,Docker,GCP,vSphere,OpenStack,BareMetal"}}
+{{#tabs name:"tab-installation-infrastructure" tabs:"AWS,Azure,Docker,GCP,vSphere,OpenStack,Metal3"}}
 {{#tab AWS}}
 
 Download the latest binary of `clusterawsadm` from the [AWS provider releases] and make sure to place it in your path.
@@ -152,7 +152,7 @@ For more information about prerequisites, credentials management, or permissions
 Please visit the [getting started guide](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/master/docs/getting-started.md).
 
 {{#/tab }}
-{{#tab BareMetal}}
+{{#tab Metal3}}
 
 Please visit the [getting started guide](https://github.com/metal3-io/cluster-api-provider-baremetal/blob/master/docs/getting-started.md).
 

diff --git a/docs/book/src/clusterctl/provider-contract.md b/docs/book/src/clusterctl/provider-contract.md
@@ -172,7 +172,7 @@ providers.
 |CAPA          | cluster.x-k8s.io/provider=infrastructure-aws       |
 |CAPV          | cluster.x-k8s.io/provider=infrastructure-vsphere   |
 |CAPD          | cluster.x-k8s.io/provider=infrastructure-docker    |
-|CAPBM         | cluster.x-k8s.io/provider=infrastructure-baremetal |
+|CAPM3         | cluster.x-k8s.io/provider=infrastructure-metal3    |
 |CAPZ          | cluster.x-k8s.io/provider=infrastructure-azure     |
 
 ### Workload cluster templates

diff --git a/docs/book/src/reference/providers.md b/docs/book/src/reference/providers.md
@@ -14,7 +14,7 @@ support v1alpha2 API types.
 - [**AWS**](https://github.com/kubernetes-sigs/cluster-api-provider-aws)
 - [Azure](https://github.com/kubernetes-sigs/cluster-api-provider-azure)
 - [Baidu Cloud](https://github.com/baidu/cluster-api-provider-baiducloud)
-- [Bare Metal](https://github.com/metal3-io/cluster-api-provider-baremetal)
+- [Metal3](https://github.com/metal3-io/cluster-api-provider-baremetal)
 - [DigitalOcean](https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean)
 - [Exoscale](https://github.com/exoscale/cluster-api-provider-exoscale)
 - [GCP](https://github.com/kubernetes-sigs/cluster-api-provider-gcp)