Skip to content

Commit 3ad24c1

Browse files
authored
Merge pull request #8902 from zalando-incubator/karpenter-v1.1
Update to Karpenter v1.1.1 [3/x]
2 parents c5f2089 + 6b4eb6a commit 3ad24c1

11 files changed

+50
-1726
lines changed

cluster/manifests/deletions.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,16 @@ post_apply:
132132
namespace: kubenurse
133133
kind: Service
134134
{{- end }}
135+
# Remove karpenter webhook related resources which are not used since v1.1.1
136+
- name: karpenter-lease
137+
kind: Role
138+
namespace: kube-node-lease
139+
- name: karpenter-lease
140+
kind: RoleBinding
141+
namespace: kube-node-lease
142+
- name: karpenter-cert
143+
kind: Secret
144+
namespace: kube-system
135145
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "false" }}
136146
- name: provisioners.karpenter.sh
137147
kind: CustomResourceDefinition
@@ -391,3 +401,6 @@ post_apply:
391401
kind: ServiceAccount
392402
namespace: kube-system
393403
{{- end}}
404+
- name: karpenter-v1-migrator
405+
namespace: "kube-system"
406+
kind: CronJob

cluster/manifests/z-karpenter/02-role.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@ rules:
1515
- apiGroups: ["coordination.k8s.io"]
1616
resources: ["leases"]
1717
verbs: ["get", "watch"]
18-
- apiGroups: [""]
19-
resources: ["configmaps", "secrets"]
20-
verbs: ["get", "list", "watch"]
2118
# Write
22-
- apiGroups: [""]
23-
resources: ["secrets"]
24-
verbs: ["update"]
25-
resourceNames:
26-
- "karpenter-cert"
2719
- apiGroups: ["coordination.k8s.io"]
2820
resources: ["leases"]
2921
verbs: ["patch", "update"]
@@ -50,23 +42,4 @@ rules:
5042
resources: ["services"]
5143
resourceNames: ["kube-dns"]
5244
verbs: ["get"]
53-
---
54-
# Source: karpenter/templates/role.yaml
55-
apiVersion: rbac.authorization.k8s.io/v1
56-
kind: Role
57-
metadata:
58-
name: karpenter-lease
59-
namespace: kube-node-lease
60-
labels:
61-
application: kubernetes
62-
component: karpenter
63-
rules:
64-
# Read
65-
- apiGroups: ["coordination.k8s.io"]
66-
resources: ["leases"]
67-
verbs: ["get", "list", "watch"]
68-
# Write
69-
- apiGroups: ["coordination.k8s.io"]
70-
resources: ["leases"]
71-
verbs: ["delete"]
7245
{{end}}

cluster/manifests/z-karpenter/03-rolebinding.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,4 @@ subjects:
3535
- kind: ServiceAccount
3636
name: karpenter
3737
namespace: kube-system
38-
---
39-
# Source: karpenter/templates/rolebinding.yaml
40-
apiVersion: rbac.authorization.k8s.io/v1
41-
kind: RoleBinding
42-
metadata:
43-
name: karpenter-lease
44-
namespace: kube-node-lease
45-
labels:
46-
application: kubernetes
47-
component: karpenter
48-
roleRef:
49-
apiGroup: rbac.authorization.k8s.io
50-
kind: Role
51-
name: karpenter-lease
52-
subjects:
53-
- kind: ServiceAccount
54-
name: karpenter
55-
namespace: kube-system
5638
{{end}}

cluster/manifests/z-karpenter/05-clusterrole-core.yaml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ rules:
2222
- apiGroups: ["apps"]
2323
resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
2424
verbs: ["list", "watch"]
25-
- apiGroups: ["apiextensions.k8s.io"]
26-
resources: ["customresourcedefinitions"]
27-
verbs: ["get", "watch", "list"]
2825
- apiGroups: ["policy"]
2926
resources: ["poddisruptionbudgets"]
3027
verbs: ["get", "list", "watch"]
28+
- apiGroups: [""]
29+
resources: ["events"]
30+
verbs: ["get", list, "watch"]
3131
# Write
3232
- apiGroups: ["karpenter.sh"]
3333
resources: ["nodeclaims", "nodeclaims/status"]
@@ -47,14 +47,6 @@ rules:
4747
- apiGroups: [""]
4848
resources: ["pods"]
4949
verbs: ["delete"]
50-
- apiGroups: ["apiextensions.k8s.io"]
51-
resources: ["customresourcedefinitions/status"]
52-
resourceNames: ["ec2nodeclasses.karpenter.k8s.aws", "nodepools.karpenter.sh", "nodeclaims.karpenter.sh"]
53-
verbs: ["patch"]
54-
- apiGroups: ["apiextensions.k8s.io"]
55-
resources: ["customresourcedefinitions"]
56-
resourceNames: ["ec2nodeclasses.karpenter.k8s.aws", "nodepools.karpenter.sh", "nodeclaims.karpenter.sh"]
57-
verbs: ["update"]
5850
---
5951
# Source: karpenter/templates/clusterrole-core.yaml
6052
apiVersion: rbac.authorization.k8s.io/v1

0 commit comments

Comments
 (0)