Skip to content

Commit

Permalink
Merge pull request #8902 from zalando-incubator/karpenter-v1.1
Browse files Browse the repository at this point in the history
Update to Karpenter v1.1.1 [3/x]
  • Loading branch information
demonCoder95 authored Feb 24, 2025
2 parents c5f2089 + 6b4eb6a commit 3ad24c1
Show file tree
Hide file tree
Showing 11 changed files with 50 additions and 1,726 deletions.
13 changes: 13 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 Expand Up @@ -391,3 +401,6 @@ post_apply:
kind: ServiceAccount
namespace: kube-system
{{- end}}
- name: karpenter-v1-migrator
namespace: "kube-system"
kind: CronJob
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
Loading

0 comments on commit 3ad24c1

Please sign in to comment.