Skip to content

Commit

Permalink
k8s update
Browse files Browse the repository at this point in the history
  • Loading branch information
paulofponciano committed Dec 17, 2023
1 parent 8276dbb commit 7d64be7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 4 additions & 0 deletions argocd/argocd_install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18844,6 +18844,8 @@ metadata:
app.kubernetes.io/name: argocd-cm
app.kubernetes.io/part-of: argocd
name: argocd-cm
data:
application.resourceTrackingMethod: annotation
---
apiVersion: v1
kind: ConfigMap
Expand All @@ -18852,6 +18854,8 @@ metadata:
app.kubernetes.io/name: argocd-cmd-params-cm
app.kubernetes.io/part-of: argocd
name: argocd-cmd-params-cm
data:
server.insecure: "true"
---
apiVersion: v1
kind: ConfigMap
Expand Down
3 changes: 1 addition & 2 deletions helm_karpenter.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ resource "helm_release" "karpenter" {
name = "karpenter"
repository = "oci://public.ecr.aws/karpenter"
chart = "karpenter"
version = "v0.27.3"
#version = "v0.29.2"
version = "v0.31.0"

set {
name = "serviceAccount.annotations.eks\\.amazonaws\\.com/role-arn"
Expand Down
1 change: 1 addition & 0 deletions karpenter/karpenter-controller-trust-policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"ec2:DescribeSecurityGroups",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeInstances",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstanceTypeOfferings",
"ec2:DescribeAvailabilityZones",
Expand Down
8 changes: 2 additions & 6 deletions karpenter/provisioner.yml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ apiVersion: karpenter.sh/v1alpha5
kind: Provisioner
metadata:
name: ${EKS_CLUSTER}
namespace: kube-system
namespace: karpenter
spec:
topologySpreadConstraints:
- maxSkew: 1
topologyKey: "topology.kubernetes.io/zone"
whenUnsatisfiable: ScheduleAnyway
ttlSecondsAfterEmpty: 60 # scale down nodes after 60 seconds without workloads (excluding daemons)
ttlSecondsUntilExpired: 604800 # expire nodes after 7 days (in seconds) = 7 * 60 * 60 * 24
limits:
resources:
cpu: 200 # limit to 100 CPU cores the maximum cluster usage
cpu: 200
requirements:
# Include general purpose instance families
- key: karpenter.k8s.aws/instance-family
Expand Down
10 changes: 5 additions & 5 deletions variables.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ az2 = "us-east-2b"

## CLUSTER OPTIONS

k8s_version = "1.27"
k8s_version = "1.28"

endpoint_private_access = true

Expand All @@ -25,10 +25,10 @@ enabled_cluster_log_types = [
"api", "audit", "authenticator", "controllerManager", "scheduler"
]

addon_cni_version = "v1.13.4-eksbuild.1"
addon_coredns_version = "v1.10.1-eksbuild.2"
addon_kubeproxy_version = "v1.27.3-eksbuild.2"
addon_csi_version = "v1.21.0-eksbuild.1"
addon_cni_version = "v1.15.0-eksbuild.2"
addon_coredns_version = "v1.10.1-eksbuild.4"
addon_kubeproxy_version = "v1.28.2-eksbuild.2"
addon_csi_version = "v1.23.0-eksbuild.1"

## INGRESS OPTIONS (ISTIO NLB)

Expand Down

0 comments on commit 7d64be7

Please sign in to comment.