mirror of https://github.com/kubernetes/kops.git
fix typo kubeReserved not systemReserved and remove ec2:DescribeImages iam right not needed we use launch templates
This commit is contained in:
parent
a34939b5c0
commit
e40239b241
|
@ -56,7 +56,6 @@ func addKarpenterPermissions(p *iam.Policy) {
|
|||
"ec2:DescribeAvailabilityZones",
|
||||
"ec2:DescribeInstanceTypeOfferings",
|
||||
"ec2:DescribeInstanceTypes",
|
||||
"ec2:DescribeImages",
|
||||
"ec2:DescribeInstances",
|
||||
"ec2:DescribeLaunchTemplates",
|
||||
"ec2:DescribeSecurityGroups",
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
"ec2:CreateFleet",
|
||||
"ec2:CreateTags",
|
||||
"ec2:DescribeAvailabilityZones",
|
||||
"ec2:DescribeImages",
|
||||
"ec2:DescribeInstanceTypeOfferings",
|
||||
"ec2:DescribeInstanceTypes",
|
||||
"ec2:DescribeInstances",
|
||||
|
|
|
@ -69,7 +69,7 @@ spec:
|
|||
version: 9.99.0
|
||||
- id: k8s-1.19
|
||||
manifest: karpenter.sh/k8s-1.19.yaml
|
||||
manifestHash: a2fa3c54def633c1a18879649ced3defc58cfe557dc15e11fc2e7a6d56d154eb
|
||||
manifestHash: b6cd8f0b7dcdf48fc658eb95d9948900665562de99e317c565fdfbfbdc4481bb
|
||||
name: karpenter.sh
|
||||
selector:
|
||||
k8s-addon: karpenter.sh
|
||||
|
|
|
@ -1457,6 +1457,9 @@ spec:
|
|||
consolidation:
|
||||
enabled: true
|
||||
kubeletConfiguration:
|
||||
kubeReserved:
|
||||
cpu: 500m
|
||||
memory: 1G
|
||||
maxPods: 50
|
||||
systemReserved:
|
||||
cpu: 500m
|
||||
|
|
|
@ -1205,7 +1205,7 @@ spec:
|
|||
{{ end }}
|
||||
{{ end }}
|
||||
{{ if .KubeReserved }}
|
||||
systemReserved:
|
||||
kubeReserved:
|
||||
{{ range $key, $val := .KubeReserved}}
|
||||
{{ $key }}: "{{ $val }}"
|
||||
{{ end }}
|
||||
|
|
Loading…
Reference in New Issue