From a7f23b80e0d99e442d6c39f2e2333225817b866d Mon Sep 17 00:00:00 2001 From: Richard Case Date: Tue, 10 Aug 2021 15:52:48 +0100 Subject: [PATCH] chore: remove separate eks providers and update quick start Signed-off-by: Richard Case --- cmd/clusterctl/client/config/providers_client.go | 12 ------------ cmd/clusterctl/client/config_test.go | 4 ---- cmd/clusterctl/cmd/config_repositories_test.go | 10 ---------- docs/book/src/user/quick-start.md | 2 ++ 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/cmd/clusterctl/client/config/providers_client.go b/cmd/clusterctl/client/config/providers_client.go index 178a7fa7fc8a..60e4699058b3 100644 --- a/cmd/clusterctl/client/config/providers_client.go +++ b/cmd/clusterctl/client/config/providers_client.go @@ -50,14 +50,12 @@ const ( const ( KubeadmBootstrapProviderName = "kubeadm" TalosBootstrapProviderName = "talos" - AWSEKSBootstrapProviderName = "aws-eks" ) // ControlPlane providers. const ( KubeadmControlPlaneProviderName = "kubeadm" TalosControlPlaneProviderName = "talos" - AWSEKSControlPlaneProviderName = "aws-eks" NestedControlPlaneProviderName = "nested" ) @@ -175,11 +173,6 @@ func (p *providersClient) defaults() []Provider { url: "https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/releases/latest/bootstrap-components.yaml", providerType: clusterctlv1.BootstrapProviderType, }, - &provider{ - name: AWSEKSBootstrapProviderName, - url: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/eks-bootstrap-components.yaml", - providerType: clusterctlv1.BootstrapProviderType, - }, // ControlPlane providers &provider{ name: KubeadmControlPlaneProviderName, @@ -191,11 +184,6 @@ func (p *providersClient) defaults() []Provider { url: "https://github.com/talos-systems/cluster-api-control-plane-provider-talos/releases/latest/control-plane-components.yaml", providerType: clusterctlv1.ControlPlaneProviderType, }, - &provider{ - name: AWSEKSControlPlaneProviderName, - url: "https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/eks-controlplane-components.yaml", - providerType: clusterctlv1.ControlPlaneProviderType, - }, &provider{ name: NestedControlPlaneProviderName, url: "https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/control-plane-components.yaml", diff --git a/cmd/clusterctl/client/config_test.go b/cmd/clusterctl/client/config_test.go index 8d0ae00ac4c4..d0f483545f3c 100644 --- a/cmd/clusterctl/client/config_test.go +++ b/cmd/clusterctl/client/config_test.go @@ -56,10 +56,8 @@ 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.AWSEKSBootstrapProviderName, config.KubeadmBootstrapProviderName, config.TalosBootstrapProviderName, - config.AWSEKSControlPlaneProviderName, config.KubeadmControlPlaneProviderName, config.NestedControlPlaneProviderName, config.TalosControlPlaneProviderName, @@ -85,11 +83,9 @@ 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.AWSEKSBootstrapProviderName, customProviderConfig.Name(), config.KubeadmBootstrapProviderName, config.TalosBootstrapProviderName, - config.AWSEKSControlPlaneProviderName, config.KubeadmControlPlaneProviderName, config.NestedControlPlaneProviderName, config.TalosControlPlaneProviderName, diff --git a/cmd/clusterctl/cmd/config_repositories_test.go b/cmd/clusterctl/cmd/config_repositories_test.go index 87c355b2b519..9fd2fd1b2daa 100644 --- a/cmd/clusterctl/cmd/config_repositories_test.go +++ b/cmd/clusterctl/cmd/config_repositories_test.go @@ -102,10 +102,8 @@ providers: var expectedOutputText = `NAME TYPE URL FILE cluster-api CoreProvider https://github.com/myorg/myforkofclusterapi/releases/latest/ core_components.yaml another-provider BootstrapProvider ./ bootstrap-components.yaml -aws-eks BootstrapProvider https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/ eks-bootstrap-components.yaml kubeadm BootstrapProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ bootstrap-components.yaml talos BootstrapProvider https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/releases/latest/ bootstrap-components.yaml -aws-eks ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/ eks-controlplane-components.yaml kubeadm ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api/releases/latest/ control-plane-components.yaml nested ControlPlaneProvider https://github.com/kubernetes-sigs/cluster-api-provider-nested/releases/latest/ control-plane-components.yaml talos ControlPlaneProvider https://github.com/talos-systems/cluster-api-control-plane-provider-talos/releases/latest/ control-plane-components.yaml @@ -131,10 +129,6 @@ var expectedOutputYaml = `- File: core_components.yaml Name: another-provider ProviderType: BootstrapProvider URL: ./ -- File: eks-bootstrap-components.yaml - Name: aws-eks - ProviderType: BootstrapProvider - URL: https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/ - File: bootstrap-components.yaml Name: kubeadm ProviderType: BootstrapProvider @@ -143,10 +137,6 @@ var expectedOutputYaml = `- File: core_components.yaml Name: talos ProviderType: BootstrapProvider URL: https://github.com/talos-systems/cluster-api-bootstrap-provider-talos/releases/latest/ -- File: eks-controlplane-components.yaml - Name: aws-eks - ProviderType: ControlPlaneProvider - URL: https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest/ - File: control-plane-components.yaml Name: kubeadm ProviderType: ControlPlaneProvider diff --git a/docs/book/src/user/quick-start.md b/docs/book/src/user/quick-start.md index 648c2d1e9c16..7a0f23a55be7 100644 --- a/docs/book/src/user/quick-start.md +++ b/docs/book/src/user/quick-start.md @@ -175,6 +175,8 @@ Download the latest binary of `clusterawsadm` from the [AWS provider releases] a The [clusterawsadm] command line utility assists with identity and access management (IAM) for [Cluster API Provider AWS][capa]. +> The AWS provider additionaly allows you to create EKS based clusters. If you don't plan to use EKS then please see the [disabling EKS documentation](https://cluster-api-aws.sigs.k8s.io/topics/eks/disabling.html) before proceeding. + ```bash export AWS_REGION=us-east-1 # This is used to help encode your environment variables export AWS_ACCESS_KEY_ID=