Merge pull request #8901 from zalando-incubator/karpenter-pre-v1.1

Pre karpenter v1.1.1 changes [2/x]

Author: demonCoder95

cluster/manifests/z-karpenter/v1-migrator-cronjob.yaml

@@ -30,7 +30,7 @@ spec:
           - name: karpenter-v1-migrator
             image: container-registry.zalando.net/teapot/karpenter-v1-migrator:main-2
             args:
-            - -mode=nc-fix
+            - -mode=drop-compatibility-annotations
             resources:
               limits:
                 cpu: 100m

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

@@ -1,6 +1,6 @@
 #{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
 ---
-apiVersion: karpenter.k8s.aws/v1beta1
+apiVersion: karpenter.k8s.aws/v1
 kind: EC2NodeClass
 metadata:
   name: "{{ .NodePool.Name }}"
@@ -40,6 +40,24 @@ spec:
   # {{ end }}
   # If you enable this option, the Amazon EC2 console displays monitoring graphs with a 1-minute period for the instances that Karpenter launches.
   detailedMonitoring: false
+  # Karpenter provides the ability to specify a few additional Kubelet args.
+  # These are all optional and provide support for additional customization and use cases.
+  kubelet:
+    clusterDNS: [ "10.0.1.100" ]
+    cpuCFSQuota: false
+#{{ if ne .Cluster.Provider "zalando-eks" }}
+# {{ if ne .Cluster.ConfigItems.karpenter_max_pods_per_node "" }}
+    maxPods: {{ .Cluster.ConfigItems.karpenter_max_pods_per_node }}
+# {{ else }}
+    maxPods: {{ nodeCIDRMaxPods (parseInt64 .Cluster.ConfigItems.node_cidr_mask_size) (parseInt64 .Cluster.ConfigItems.node_max_pods_extra_capacity) }}
+# {{ end }}
+#{{ end }}
+    systemReserved:
+      cpu: "{{ .Cluster.ConfigItems.kubelet_system_reserved_cpu }}"
+      memory: "{{ .Cluster.ConfigItems.kubelet_system_reserved_memory }}"
+    kubeReserved:
+      cpu: "{{ .Cluster.ConfigItems.kubelet_kube_reserved_cpu }}"
+      memory: "{{ .Cluster.ConfigItems.kubelet_kube_reserved_memory }}"
   tags:
     Name: "{{ .NodePool.Name }} ({{ .Cluster.ID }})"
     InfrastructureComponent: 'true'
@@ -68,7 +86,7 @@ spec:
   userData: |
 {{ .Values.UserData | indent 4 }}
 ---
-apiVersion: karpenter.sh/v1beta1
+apiVersion: karpenter.sh/v1
 kind: NodePool
 metadata:
   name: "{{.NodePool.Name}}"
@@ -98,6 +116,10 @@ spec:
         karpenter.sh/do-not-disrupt: "true"
 #{{  end }}
     spec:
+      # The amount of time a Node can live on the cluster before being removed
+      # Avoiding long-running Nodes helps to reduce security vulnerabilities as well as to reduce the chance of issues that can plague Nodes with long uptimes such as file fragmentation or memory leaks from system processes
+      # You can choose to disable expiration entirely by setting the string value 'Never' here
+      expireAfter: Never
       # References the Cloud Provider's NodeClass resource, see your cloud provider specific documentation
       nodeClassRef:
         name: {{ .NodePool.Name }}
@@ -215,22 +237,6 @@ spec:
 #{{ range $az :=  $azs }}
           - "{{ $az }}"
 #{{ end }}
-      # Karpenter provides the ability to specify a few additional Kubelet args.
-      # These are all optional and provide support for additional customization and use cases.
-      kubelet:
-        clusterDNS: [ "10.0.1.100" ]
-        cpuCFSQuota: false
-# {{ if ne .Cluster.ConfigItems.karpenter_max_pods_per_node "" }}
-        maxPods: {{ .Cluster.ConfigItems.karpenter_max_pods_per_node }}
-# {{ else }}
-        maxPods: {{ nodeCIDRMaxPods (parseInt64 .Cluster.ConfigItems.node_cidr_mask_size) (parseInt64 .Cluster.ConfigItems.node_max_pods_extra_capacity) }}
-# {{ end }}
-        systemReserved:
-          cpu: "{{ .Cluster.ConfigItems.kubelet_system_reserved_cpu }}"
-          memory: "{{ .Cluster.ConfigItems.kubelet_system_reserved_memory }}"
-        kubeReserved:
-          cpu: "{{ .Cluster.ConfigItems.kubelet_kube_reserved_cpu }}"
-          memory: "{{ .Cluster.ConfigItems.kubelet_kube_reserved_memory }}"
   # Disruption section which describes the ways in which Karpenter can disrupt and replace Nodes
   # Configuration in this section constrains how aggressive Karpenter can be with performing operations
   # like rolling Nodes due to them hitting their maximum lifetime (expiry) or scaling down nodes to reduce cluster cost
@@ -240,7 +246,7 @@ spec:
       - nodes: "5%"
       - nodes: "10"
     # Describes which types of Nodes Karpenter should consider for consolidation
-    # If using 'WhenUnderutilized', Karpenter will consider all nodes for consolidation and attempt to remove or replace Nodes when it discovers that the Node is underutilized and could be changed to reduce cost
+    # If using 'WhenEmptyOrUnderutilized', Karpenter will consider all nodes for consolidation and attempt to remove or replace Nodes when it discovers that the Node is underutilized and could be changed to reduce cost
     # If using `WhenEmpty`, Karpenter will only consider nodes for consolidation that contain no workload pods
 #{{  if and (index .NodePool.ConfigItems "consolidation_policy") (eq .NodePool.ConfigItems.consolidation_policy "WhenEmpty") }}
     consolidationPolicy: WhenEmpty
@@ -249,12 +255,8 @@ spec:
     # You can choose to disable consolidation entirely by setting the string value 'Never' here
     consolidateAfter: {{ or (index .NodePool.ConfigItems "consolidate_after") "10m" }}
 #{{  else }}
-    consolidationPolicy: WhenUnderutilized
+    consolidationPolicy: WhenEmptyOrUnderutilized
 #{{  end }}
-    # The amount of time a Node can live on the cluster before being removed
-    # Avoiding long-running Nodes helps to reduce security vulnerabilities as well as to reduce the chance of issues that can plague Nodes with long uptimes such as file fragmentation or memory leaks from system processes
-    # You can choose to disable expiration entirely by setting the string value 'Never' here
-    expireAfter: Never
   # Priority given to the NodePool when the scheduler considers which NodePool
   # to select. Higher weights indicate higher priority when comparing NodePools.
   # Specifying no weight is equivalent to specifying a weight of 0.