Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: clowdhaus/eks-reference-architecture
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc711986bffca5b577cf5235d65ef521d3593ee4
Choose a base ref
..
head repository: clowdhaus/eks-reference-architecture
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0138b4df7e1b3edaceb93ecf87532696581438d9
Choose a head ref
Showing with 14 additions and 4 deletions.
  1. +5 −1 cluster-autoscaler/README.md
  2. +2 −2 cluster-autoscaler/eks.tf
  3. +6 −0 inferentia/README.md
  4. +1 −1 karpenter/karpenter.tf
6 changes: 5 additions & 1 deletion cluster-autoscaler/README.md
Original file line number Diff line number Diff line change
@@ -44,6 +44,10 @@ kubectl apply -f inflate.yaml
1. Remove the resources created by Terraform

```sh
terraform destroy -target=module.eks_blueprints_addons
# 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
```
4 changes: 2 additions & 2 deletions cluster-autoscaler/eks.tf
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

module "eks" {
source = "terraform-aws-modules/eks/aws"
version = "~> 20.4"
version = "~> 20.5"

cluster_name = local.name
cluster_version = "1.29"
@@ -40,7 +40,7 @@ module "eks" {
max_size = 20
desired_size = 1

tags = {
launch_template_tags = {
"k8s.io/cluster-autoscaler/enabled" : true,
"k8s.io/cluster-autoscaler/${local.name}" : "owned",
}
6 changes: 6 additions & 0 deletions inferentia/README.md
Original file line number Diff line number Diff line change
@@ -152,5 +152,11 @@ This will show the endpoint that can be used to send requests to the model and g
1. Remove the resources created by Terraform

```sh
# 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 -target='module.eks_blueprints_addons'
terraform destroy
```
2 changes: 1 addition & 1 deletion karpenter/karpenter.tf
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ resource "helm_release" "karpenter" {
repository_username = data.aws_ecrpublic_authorization_token.token.user_name
repository_password = data.aws_ecrpublic_authorization_token.token.password
chart = "karpenter"
version = "0.35.0"
version = "0.35.1"
wait = false

values = [