Merge pull request #8984 from zalando-incubator/dev-to-eks

dev to eks

Author: mikkeloscar

cluster/manifests/deletions.yaml

@@ -151,16 +151,6 @@ post_apply:
   namespace: kubenurse
   kind: Service
 {{- end }}
-# Remove karpenter webhook related resources which are not used since v1.1.1
-- name: karpenter-lease
-  kind: Role
-  namespace: kube-node-lease
-- name: karpenter-lease
-  kind: RoleBinding
-  namespace: kube-node-lease
-- name: karpenter-cert
-  kind: Secret
-  namespace: kube-system
 {{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "false" }}
 - name: provisioners.karpenter.sh
   kind: CustomResourceDefinition
@@ -420,6 +410,3 @@ post_apply:
   kind: ServiceAccount
   namespace: kube-system
 {{- end}}
-- name: karpenter-v1-migrator
-  namespace: "kube-system"
-  kind: CronJob

cluster/manifests/z-karpenter/07-karpenter.k8s.aws_ec2nodeclasses.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: ec2nodeclasses.karpenter.k8s.aws
 spec:
   group: karpenter.k8s.aws

cluster/manifests/z-karpenter/08-karpenter.sh_nodeclaims.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: nodeclaims.karpenter.sh
 spec:
   group: karpenter.sh
@@ -36,6 +36,10 @@ spec:
         - jsonPath: .metadata.creationTimestamp
           name: Age
           type: date
+        - jsonPath: .status.imageID
+          name: ImageID
+          priority: 1
+          type: string
         - jsonPath: .status.providerID
           name: ID
           priority: 1

cluster/manifests/z-karpenter/09-karpenter.sh_nodepools.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.5
+    controller-gen.kubebuilder.io/version: v0.17.1
   name: nodepools.karpenter.sh
 spec:
   group: karpenter.sh

cluster/manifests/z-karpenter/deployment.yaml

@@ -26,7 +26,7 @@ spec:
         component: karpenter
       annotations:
         logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}"
-        prometheus.io/port: "8000"
+        prometheus.io/port: "8080"
         prometheus.io/path: "/metrics"
         prometheus.io/scheme: "http"
         prometheus.io/scrape: "true"
@@ -50,7 +50,7 @@ spec:
               drop:
                 - ALL
             readOnlyRootFilesystem: true
-          image: "container-registry.zalando.net/teapot/karpenter:1.1.1-main-29.patched"
+          image: "container-registry.zalando.net/teapot/karpenter:1.2.0-main-30.patched"
           imagePullPolicy: IfNotPresent
           env:
             - name: KUBERNETES_MIN_VERSION
@@ -74,7 +74,7 @@ spec:
             - name: LOG_ERROR_OUTPUT_PATHS
               value: "stderr"
             - name: METRICS_PORT
-              value: "8000"
+              value: "8080"
             - name: HEALTH_PROBE_PORT
               value: "8081"
             - name: SYSTEM_NAMESPACE
@@ -106,7 +106,7 @@ spec:
               value: "{{ nodeCIDRMaxNodesPodCIDR (parseInt64 $pod_cidr_size) (parseInt64 .Cluster.ConfigItems.node_cidr_mask_size) (parseInt64 .Cluster.ConfigItems.reserved_nodes) }}"
           ports:
             - name: http-metrics
-              containerPort: 8000
+              containerPort: 8080
               protocol: TCP
             - name: http
               containerPort: 8081