Skip to content

Commit

Permalink
Update to Karpenter v1.1.1
Browse files Browse the repository at this point in the history
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
  • Loading branch information
mikkeloscar committed Feb 12, 2025
1 parent ae7ad8c commit 9346e2c
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 1,679 deletions.
10 changes: 10 additions & 0 deletions cluster/manifests/deletions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ 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
Expand Down
27 changes: 0 additions & 27 deletions cluster/manifests/z-karpenter/02-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ rules:
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["get", "watch"]
- apiGroups: [""]
resources: ["configmaps", "secrets"]
verbs: ["get", "list", "watch"]
# Write
- apiGroups: [""]
resources: ["secrets"]
verbs: ["update"]
resourceNames:
- "karpenter-cert"
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["patch", "update"]
Expand All @@ -50,23 +42,4 @@ rules:
resources: ["services"]
resourceNames: ["kube-dns"]
verbs: ["get"]
---
# Source: karpenter/templates/role.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: karpenter-lease
namespace: kube-node-lease
labels:
application: kubernetes
component: karpenter
rules:
# Read
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["get", "list", "watch"]
# Write
- apiGroups: ["coordination.k8s.io"]
resources: ["leases"]
verbs: ["delete"]
{{end}}
18 changes: 0 additions & 18 deletions cluster/manifests/z-karpenter/03-rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,4 @@ subjects:
- kind: ServiceAccount
name: karpenter
namespace: kube-system
---
# Source: karpenter/templates/rolebinding.yaml
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: karpenter-lease
namespace: kube-node-lease
labels:
application: kubernetes
component: karpenter
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: karpenter-lease
subjects:
- kind: ServiceAccount
name: karpenter
namespace: kube-system
{{end}}
14 changes: 3 additions & 11 deletions cluster/manifests/z-karpenter/05-clusterrole-core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ rules:
- apiGroups: ["apps"]
resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
verbs: ["list", "watch"]
- apiGroups: ["apiextensions.k8s.io"]
resources: ["customresourcedefinitions"]
verbs: ["get", "watch", "list"]
- apiGroups: ["policy"]
resources: ["poddisruptionbudgets"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["events"]
verbs: ["get", list, "watch"]
# Write
- apiGroups: ["karpenter.sh"]
resources: ["nodeclaims", "nodeclaims/status"]
Expand All @@ -47,14 +47,6 @@ rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["delete"]
- apiGroups: ["apiextensions.k8s.io"]
resources: ["customresourcedefinitions/status"]
resourceNames: ["ec2nodeclasses.karpenter.k8s.aws", "nodepools.karpenter.sh", "nodeclaims.karpenter.sh"]
verbs: ["patch"]
- apiGroups: ["apiextensions.k8s.io"]
resources: ["customresourcedefinitions"]
resourceNames: ["ec2nodeclasses.karpenter.k8s.aws", "nodepools.karpenter.sh", "nodeclaims.karpenter.sh"]
verbs: ["update"]
---
# Source: karpenter/templates/clusterrole-core.yaml
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
578 changes: 7 additions & 571 deletions cluster/manifests/z-karpenter/07-karpenter.k8s.aws_ec2nodeclasses.yaml

Large diffs are not rendered by default.

458 changes: 10 additions & 448 deletions cluster/manifests/z-karpenter/08-karpenter.sh_nodeclaims.yaml

Large diffs are not rendered by default.

595 changes: 16 additions & 579 deletions cluster/manifests/z-karpenter/09-karpenter.sh_nodepools.yaml

Large diffs are not rendered by default.

16 changes: 2 additions & 14 deletions cluster/manifests/z-karpenter/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ spec:
- ALL
readOnlyRootFilesystem: true
{{if eq .Cluster.ConfigItems.karpenter_version "current"}}
image: "container-registry-test.zalando.net/teapot/karpenter:1.0.5-pr-27-5.patched"
image: "container-registry-test.zalando.net/teapot/karpenter:1.1.1-pr-30-1.patched
{{else if eq .Cluster.ConfigItems.karpenter_version "legacy"}}
image: "container-registry.zalando.net/teapot/karpenter:0.37.0-main-26.patched"
image: "container-registry-test.zalando.net/teapot/karpenter:1.0.5-pr-27-5.patched"
{{end}}
imagePullPolicy: IfNotPresent
env:
Expand All @@ -71,12 +71,6 @@ spec:
value: "false"
- name: KARPENTER_SERVICE
value: karpenter
- name: WEBHOOK_PORT
value: "8443"
- name: WEBHOOK_METRICS_PORT
value: "8001"
- name: DISABLE_WEBHOOK
value: "false"
- name: LOG_LEVEL
value: {{ .Cluster.ConfigItems.karpenter_log_level }}
- name: LOG_OUTPUT_PATHS
Expand Down Expand Up @@ -118,12 +112,6 @@ spec:
- name: http-metrics
containerPort: 8000
protocol: TCP
- name: webhook-metrics
containerPort: 8001
protocol: TCP
- name: https-webhook
containerPort: 8443
protocol: TCP
- name: http
containerPort: 8081
protocol: TCP
Expand Down
11 changes: 0 additions & 11 deletions cluster/manifests/z-karpenter/secret-webhook-cert.yaml

This file was deleted.

0 comments on commit 9346e2c

Please sign in to comment.