Skip to content

Commit 0de3668

Browse files
committed
Make Karpenter the default by removing migration flags
Signed-off-by: ayruslore <suryasrikar1997@gmail.com>
1 parent b077ee6 commit 0de3668

File tree

4 files changed

+0
-36
lines changed

4 files changed

+0
-36
lines changed

cluster/config-defaults.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ worker_sg_legacy_cluster: ""
129129
# skipper node-pool
130130
enable_dedicate_nodepool_skipper: "true"
131131
skipper_attach_only_to_skipper_node_pool: "true"
132-
skipper_karpenter_node_pools_enabled: "true"
133132

134133
skipper_suppress_route_update_logs: "true"
135134
skipper_validate_query: "true"

cluster/manifests/skipper/deployment.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ spec:
9292
component: ingress
9393
application: skipper-ingress
9494
{{- end }}
95-
{{ if eq .Cluster.ConfigItems.skipper_karpenter_node_pools_enabled "true" }}
9695
affinity:
9796
podAntiAffinity:
9897
requiredDuringSchedulingIgnoredDuringExecution:
@@ -133,15 +132,6 @@ spec:
133132
- c6g.4xlarge
134133
- c6g.8xlarge
135134
- m6g.large
136-
{{ else }}
137-
affinity:
138-
nodeAffinity:
139-
requiredDuringSchedulingIgnoredDuringExecution:
140-
nodeSelectorTerms:
141-
- matchExpressions:
142-
- key: zalando.org/ingress-karpenter-managed
143-
operator: DoesNotExist
144-
{{ end }}
145135
priorityClassName: "{{ .Cluster.ConfigItems.system_priority_class }}"
146136
serviceAccountName: skipper-ingress
147137
terminationGracePeriodSeconds: {{ .Cluster.ConfigItems.skipper_termination_grace_period }}
@@ -532,13 +522,10 @@ spec:
532522
{{ if eq .Cluster.ConfigItems.enable_dedicate_nodepool_skipper "true"}}
533523
nodeSelector:
534524
dedicated: skipper-ingress
535-
{{ if eq .Cluster.ConfigItems.skipper_karpenter_node_pools_enabled "true" }}
536-
zalando.org/ingress-karpenter-managed: "true"
537525
{{ if eq .Cluster.Environment "production" }}
538526
karpenter.sh/capacity-type: on-demand
539527
{{ else }}
540528
karpenter.sh/capacity-type: spot
541-
{{ end }}
542529
{{ end }}
543530
tolerations:
544531
- effect: NoSchedule

cluster/node-pools/worker-karpenter/provisioners.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,6 @@ spec:
192192
# {{ end}}
193193
# {{ end}}
194194
#{{ end}}
195-
#{{ if eq (index .NodePool.ConfigItems "taints") "dedicated=skipper-ingress:NoSchedule" }}
196-
- key: zalando.org/ingress-karpenter-managed
197-
operator: In
198-
values:
199-
- "true"
200-
#{{ end }}
201195

202196
#{{ if (eq .NodePool.KarpenterInstanceTypeStrategy "default-for-karpenter" ) }}
203197
- key: "karpenter.k8s.aws/instance-family"

test/e2e/cluster_config.sh

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,6 @@ EOFF
114114
config_items:
115115
requirements: "- key: kubernetes.io/arch\n operator: In\n values:\n - arm64\n"
116116
taints: kubernetes.io/arch=arm64:NoSchedule
117-
- discount_strategy: spot
118-
instance_types:
119-
- "c7g.large"
120-
- "c6i.large"
121-
- "c6a.large"
122-
- "m6i.large"
123-
- "m6a.large"
124-
- "m6g.large"
125-
- "m7g.large"
126-
min_size: 0
127-
max_size: 18
128-
profile: worker-splitaz
129-
name: skipper-ingress-node
130-
config_items:
131-
labels: dedicated=skipper-ingress
132-
taints: dedicated=skipper-ingress:NoSchedule
133117
- discount_strategy: spot
134118
instance_types:
135119
- "not-specified"

0 commit comments

Comments
 (0)