Skip to content

Commit eec1845

Browse files
authored
Merge pull request #9127 from zalando-incubator/drop-karpenter-config-item
drop karpenter_pools_enabled config-item
2 parents 3923e23 + eceb18a commit eec1845

17 files changed

+0
-89
lines changed

cluster/cluster.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,6 @@ Resources:
11211121
Path: "/"
11221122
Roles:
11231123
- !Ref WorkerIAMRole
1124-
{{- if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
11251124
KarpenterIAMRole: # role for the karpenter controller
11261125
Properties:
11271126
AssumeRolePolicyDocument: !Sub
@@ -1485,7 +1484,6 @@ Resources:
14851484
Targets:
14861485
- Id: KarpenterInterruptionQueueTarget
14871486
Arn: !GetAtt KarpenterInterruptionQueue.Arn
1488-
{{- end }}
14891487
DeploymentIAMRole:
14901488
Properties:
14911489
AssumeRolePolicyDocument:

cluster/manifests/deletions.yaml

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -151,63 +151,6 @@ post_apply:
151151
namespace: kubenurse
152152
kind: Service
153153
{{- end }}
154-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "false" }}
155-
- name: provisioners.karpenter.sh
156-
kind: CustomResourceDefinition
157-
- name: awsnodetemplates.karpenter.k8s.aws
158-
kind: CustomResourceDefinition
159-
- name: machines.karpenter.sh
160-
kind: CustomResourceDefinition
161-
- name: karpenter
162-
namespace: kube-system
163-
kind: Deployment
164-
- name: nodepools.karpenter.sh
165-
kind: CustomResourceDefinition
166-
- name: ec2nodeclasses.karpenter.k8s.aws
167-
kind: CustomResourceDefinition
168-
- name: nodeclaims.karpenter.sh
169-
kind: CustomResourceDefinition
170-
- name: karpenter
171-
namespace: kube-system
172-
kind: PodDisruptionBudget
173-
- name: karpenter
174-
namespace: kube-system
175-
kind: ServiceAccount
176-
- name: karpenter-admin
177-
kind: ClusterRole
178-
- name: karpenter-core
179-
kind: ClusterRole
180-
- name: karpenter-core
181-
kind: ClusterRoleBinding
182-
- name: karpenter
183-
kind: ClusterRole
184-
- name: karpenter
185-
kind: ClusterRoleBinding
186-
- name: karpenter
187-
namespace: kube-system
188-
kind: Role
189-
- name: karpenter-dns
190-
namespace: kube-system
191-
kind: Role
192-
- name: karpenter-lease
193-
namespace: kube-system
194-
kind: Role
195-
- name: karpenter
196-
namespace: kube-system
197-
kind: RoleBinding
198-
- name: karpenter-dns
199-
namespace: kube-system
200-
kind: RoleBinding
201-
- name: karpenter-lease
202-
namespace: kube-system
203-
kind: RoleBinding
204-
- name: karpenter
205-
namespace: kube-system
206-
kind: Service
207-
- name: karpenter-vpa
208-
namespace: kube-system
209-
kind: VerticalPodAutoscaler
210-
{{ end }}
211154
{{ if eq .Cluster.ConfigItems.skipper_open_policy_agent_enabled "false" }}
212155
- kind: ConfigMap
213156
name: open-policy-agent-config

cluster/manifests/z-karpenter/01-serviceaccount.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
# Source: karpenter/templates/serviceaccount.yaml
43
apiVersion: v1
@@ -15,4 +14,3 @@ metadata:
1514
{{- else}}
1615
iam.amazonaws.com/role: '{{ .Cluster.LocalID }}-app-karpenter'
1716
{{- end}}
18-
{{end}}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
# Source: karpenter/templates/role.yaml
43
apiVersion: rbac.authorization.k8s.io/v1
@@ -41,4 +40,3 @@ rules:
4140
resources: ["services"]
4241
resourceNames: ["kube-dns"]
4342
verbs: ["get"]
44-
{{end}}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
# Source: karpenter/templates/rolebinding.yaml
43
apiVersion: rbac.authorization.k8s.io/v1
@@ -35,4 +34,3 @@ subjects:
3534
- kind: ServiceAccount
3635
name: karpenter
3736
namespace: kube-system
38-
{{end}}

cluster/manifests/z-karpenter/04-clusterrole.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true" }}
21
---
32
# Source: karpenter/templates/clusterrole.yaml
43
apiVersion: rbac.authorization.k8s.io/v1
@@ -34,4 +33,3 @@ subjects:
3433
- kind: ServiceAccount
3534
name: karpenter
3635
namespace: kube-system
37-
{{ end }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true" }}
21
---
32
# Source: karpenter/templates/clusterrole-core.yaml
43
apiVersion: rbac.authorization.k8s.io/v1
@@ -64,4 +63,3 @@ subjects:
6463
- kind: ServiceAccount
6564
name: karpenter
6665
namespace: kube-system
67-
{{end}}

cluster/manifests/z-karpenter/06-aggregate-clusterrole.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
# Source: karpenter/templates/aggregate-clusterrole.yaml
43
apiVersion: rbac.authorization.k8s.io/v1
@@ -16,4 +15,3 @@ rules:
1615
- apiGroups: ["karpenter.k8s.aws"]
1716
resources: ["ec2nodeclasses"]
1817
verbs: ["get", "list", "watch", "create", "delete", "patch"]
19-
{{ end }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
@@ -814,4 +813,3 @@ spec:
814813
storage: true
815814
subresources:
816815
status: {}
817-
{{ end }}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{ if eq .Cluster.ConfigItems.karpenter_pools_enabled "true"}}
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
@@ -394,4 +393,3 @@ spec:
394393
storage: true
395394
subresources:
396395
status: {}
397-
{{ end }}

0 commit comments

Comments
 (0)