Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 🌱 remove separate eks providers and update quick start #5073

Closed
wants to merge 1 commit into from
Closed

[WIP] 🌱 remove separate eks providers and update quick start #5073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions cmd/clusterctl/client/config/providers_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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,
Expand All @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions cmd/clusterctl/client/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
10 changes: 0 additions & 10 deletions cmd/clusterctl/cmd/config_repositories_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docs/book/src/user/quick-start.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this link returns 404


```bash
export AWS_REGION=us-east-1 # This is used to help encode your environment variables
export AWS_ACCESS_KEY_ID=<your-access-key>
Expand Down