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.

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

fix: Forces cluster outputs to wait until access entries are complete #3000

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions examples/karpenter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ kubectl delete node -l karpenter.sh/provisioner-name=default
2. Remove the resources created by Terraform

```bash
# Necessary to avoid removing Terraform's permissions too soon before its finished
# cleaning up the resources it deployed inside the cluster
terraform state rm 'module.eks.aws_eks_access_entry.this["cluster_creator"]' || true
terraform state rm 'module.eks.aws_eks_access_policy_association.this["cluster_creator_admin"]' || true

terraform destroy
```

Expand Down
3 changes: 0 additions & 3 deletions examples/outposts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ $ terraform apply
Note that this example may create resources which cost money. Run `terraform destroy` when you don't need these resources.

```bash
# Necessary to avoid removing Terraform's permissions too soon before its finished
# cleaning up the resources it deployed inside the clsuter
terraform state rm 'module.eks.aws_eks_access_entry.this["cluster_creator_admin"]' || true
terraform destroy
```

Expand Down
20 changes: 20 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,31 @@
output "cluster_arn" {
description = "The Amazon Resource Name (ARN) of the cluster"
value = try(aws_eks_cluster.this[0].arn, null)

depends_on = [
aws_eks_access_entry.this,
aws_eks_access_policy_association.this,
]
}

output "cluster_certificate_authority_data" {
description = "Base64 encoded certificate data required to communicate with the cluster"
value = try(aws_eks_cluster.this[0].certificate_authority[0].data, null)

depends_on = [
aws_eks_access_entry.this,
aws_eks_access_policy_association.this,
]
}

output "cluster_endpoint" {
description = "Endpoint for your Kubernetes API server"
value = try(aws_eks_cluster.this[0].endpoint, null)

depends_on = [
aws_eks_access_entry.this,
aws_eks_access_policy_association.this,
]
}

output "cluster_id" {
Expand All @@ -25,6 +40,11 @@ output "cluster_id" {
output "cluster_name" {
description = "The name of the EKS cluster"
value = try(aws_eks_cluster.this[0].name, "")

depends_on = [
aws_eks_access_entry.this,
aws_eks_access_policy_association.this,
]
}

output "cluster_oidc_issuer_url" {
Expand Down