Merge pull request #8954 from zalando-incubator/consolidate-after

Fix karpenter CRDs for v1.1.1 upgrade

Author: mikkeloscar

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

@@ -122,6 +122,8 @@ spec:
       expireAfter: Never
       # References the Cloud Provider's NodeClass resource, see your cloud provider specific documentation
       nodeClassRef:
+        group: karpenter.k8s.aws
+        kind: EC2NodeClass
         name: {{ .NodePool.Name }}
 #{{ $taints := .NodePool.Taints }}
 #{{  if $taints }}
@@ -256,6 +258,7 @@ spec:
     consolidateAfter: {{ or (index .NodePool.ConfigItems "consolidate_after") "10m" }}
 #{{  else }}
     consolidationPolicy: WhenEmptyOrUnderutilized
+    consolidateAfter: {{ or (index .NodePool.ConfigItems "consolidate_after") "0s" }}
 #{{  end }}
   # Priority given to the NodePool when the scheduler considers which NodePool
   # to select. Higher weights indicate higher priority when comparing NodePools.