Skip to content

Commit

Permalink
chore: re-instating eks boostrap provider
Browse files Browse the repository at this point in the history
The apidiff test fails if anything is changed `EKSBootstrapProviderName`
so this has been kept. The new provider `AWSEKSBootstrapProviderName`
will be used instead in documentation and the providers list. If anyone
uses the `EKSBootstrapProviderName` then it will return the same as the
`AWSEKSBootstrapProviderName`.
  • Loading branch information
richardcase committed Oct 1, 2020
1 parent c3ad77c commit ce45775
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions cmd/clusterctl/client/config/providers_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const (
// Bootstrap providers
KubeadmBootstrapProviderName = "kubeadm"
TalosBootstrapProviderName = "talos"
EKSBootstrapProviderName = "aws-eks"
EKSBootstrapProviderName = "eks" // DEPRECATED: if this provider is used it returns the same as aws-eks
AWSEKSBootstrapProviderName = "aws-eks"

// ControlPlane providers
KubeadmControlPlaneProviderName = "kubeadm"
Expand Down Expand Up @@ -155,7 +156,7 @@ func (p *providersClient) defaults() []Provider {
providerType: clusterctlv1.BootstrapProviderType,
},
&provider{
name: EKSBootstrapProviderName,
name: AWSEKSBootstrapProviderName,
url: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/eks-bootstrap-components.yaml",
providerType: clusterctlv1.BootstrapProviderType,
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/client/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
// note: these will be sorted by name by the Providers() call, so be sure they are in alphabetical order here too
wantProviders: []string{
config.ClusterAPIProviderName,
config.EKSBootstrapProviderName,
config.AWSEKSBootstrapProviderName,
config.KubeadmBootstrapProviderName,
config.TalosBootstrapProviderName,
config.AWSEKSControlPlaneProviderName,
Expand All @@ -81,7 +81,7 @@ func Test_clusterctlClient_GetProvidersConfig(t *testing.T) {
// note: these will be sorted by name by the Providers() call, so be sure they are in alphabetical order here too
wantProviders: []string{
config.ClusterAPIProviderName,
config.EKSBootstrapProviderName,
config.AWSEKSBootstrapProviderName,
customProviderConfig.Name(),
config.KubeadmBootstrapProviderName,
config.TalosBootstrapProviderName,
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/client/repository/metadata_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (f *metadataClient) getEmbeddedMetadata() *clusterctlv1.Metadata {
// older version are not supported by clusterctl
},
}
case config.EKSBootstrapProviderName:
case config.EKSBootstrapProviderName, config.AWSEKSBootstrapProviderName:
return &clusterctlv1.Metadata{
TypeMeta: metav1.TypeMeta{
APIVersion: clusterctlv1.GroupVersion.String(),
Expand Down

0 comments on commit ce45775

Please sign in to comment.