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

chore: Fix pre-commit run errors #387

Merged
merged 3 commits into from
Dec 13, 2023
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
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ skip = .git,*.pdf,*.svg,go.sum,package-lock.json,*.css,.codespellrc,*.sql,websit
check-hidden = true
# some embedded images and known typoed outputs
ignore-regex = ^\s*"image/\S+": ".*|.*loopback adddress.*
# ignore-words-list =
# ignore-words-list =
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ metadata:
name: {{ .Values.name }}
spec:
amiFamily: {{ .Values.amiFamily }}
subnetSelectorTerms:
subnetSelectorTerms:
- tags:
karpenter.sh/discovery: {{ .Values.clusterName }}
kubernetes.io/role/internal-elb: "1" # Make sure that it will be scheduled on private subs
securityGroupSelectorTerms:
securityGroupSelectorTerms:
- tags:
Name: {{ .Values.clusterName }}-node
role: {{ .Values.karpenterRole }}
# Optional, propagates tags to underlying EC2 resources
tags:
tags:
Name: {{ .Values.name }}
metadataOptions:
httpEndpoint: enabled
Expand All @@ -33,7 +33,7 @@ spec:
encrypted: true
deleteOnTermination: true
detailedMonitoring: true
userData: |
userData: |
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="BOUNDARY"

Expand All @@ -52,4 +52,4 @@ spec:
# Source extra environment variables in bootstrap script
sed -i '/^set -o errexit/a\\nsource /etc/profile.d/bootstrap.sh' /etc/eks/bootstrap.sh

--BOUNDARY--
--BOUNDARY--
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ spec:
limits:
cpu: "1000"
memory: 1000Gi
weight: 10
weight: 10
2 changes: 1 addition & 1 deletion ai-ml/jupyterhub/helm/karpenter-resources/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: default
clusterName:
karpenterRole:
karpenterRole:
instanceSizes: ["xlarge", "2xlarge", "4xlarge", "8xlarge", "16xlarge", "24xlarge"]
instanceFamilies: ["c5", "m5", "r5"]
taints:
Expand Down
14 changes: 8 additions & 6 deletions workshop/emr-eks/modules/eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,12 @@ module "karpenter" {
source = "terraform-aws-modules/eks/aws//modules/karpenter"
version = "~> 19.15"

cluster_name = module.eks.cluster_name
irsa_oidc_provider_arn = module.eks.oidc_provider_arn
create_irsa = false # EKS Blueprints add-on module creates IRSA
enable_spot_termination = false # EKS Blueprints add-on module adds this feature
tags = local.tags
iam_role_additional_policies = ["arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"]
cluster_name = module.eks.cluster_name
irsa_oidc_provider_arn = module.eks.oidc_provider_arn
create_irsa = false # EKS Blueprints add-on module creates IRSA
enable_spot_termination = false # EKS Blueprints add-on module adds this feature
tags = local.tags
iam_role_additional_policies = {
AmazonSSMManagedInstanceCore = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
}
}
Loading