Skip to content

Commit c9ca2e3

Browse files
committed
hack/update-expected.sh
1 parent 0230b21 commit c9ca2e3

16 files changed

+1735
-1970
lines changed

tests/integration/update_cluster/karpenter/data/aws_cloudwatch_event_rule_minimal.example.com-ASGLifecycle_event_pattern

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_cloudwatch_event_rule_minimal.example.com-InstanceScheduledChange_event_pattern

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_cloudwatch_event_rule_minimal.example.com-InstanceStateChange_event_pattern

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_iam_role_aws-node-termination-handler.kube-system.sa.minimal.example.com_policy

Lines changed: 0 additions & 17 deletions
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_iam_role_policy_aws-node-termination-handler.kube-system.sa.minimal.example.com_policy

Lines changed: 0 additions & 26 deletions
This file was deleted.

tests/integration/update_cluster/karpenter/data/aws_iam_role_policy_karpenter.kube-system.sa.minimal.example.com_policy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
{
44
"Action": [
55
"ec2:CreateFleet",
6+
"ec2:CreateLaunchTemplate",
67
"ec2:CreateTags",
7-
"ec2:DescribeAvailabilityZones",
8+
"ec2:DeleteLaunchTemplate",
89
"ec2:DescribeImages",
910
"ec2:DescribeInstanceTypeOfferings",
1011
"ec2:DescribeInstanceTypes",
@@ -15,7 +16,12 @@
1516
"ec2:DescribeSubnets",
1617
"ec2:RunInstances",
1718
"ec2:TerminateInstances",
19+
"iam:AddRoleToInstanceProfile",
20+
"iam:DeleteInstanceProfile",
21+
"iam:GetInstanceProfile",
1822
"iam:PassRole",
23+
"iam:RemoveRoleFromInstanceProfile",
24+
"iam:TagInstanceProfile",
1925
"pricing:GetProducts",
2026
"ssm:GetParameter"
2127
],

tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ spec:
5757
karpenter:
5858
cpuRequest: 100m
5959
enabled: true
60-
image: public.ecr.aws/karpenter/controller:v0.31.3
60+
image: public.ecr.aws/karpenter/controller:1.6.2
6161
logEncoding: console
6262
logLevel: debug
6363
memoryLimit: 2Gi
@@ -185,20 +185,7 @@ spec:
185185
networking:
186186
cni: {}
187187
nodeTerminationHandler:
188-
cpuRequest: 50m
189-
deleteSQSMsgIfNodeNotFound: false
190-
enableRebalanceDraining: false
191-
enableRebalanceMonitoring: false
192-
enableScheduledEventDraining: true
193-
enableSpotInterruptionDraining: true
194-
enabled: true
195-
excludeFromLoadBalancers: true
196-
managedASGTag: aws-node-termination-handler/managed
197-
memoryRequest: 64Mi
198-
podTerminationGracePeriod: -1
199-
prometheusEnable: false
200-
taintNode: false
201-
version: v1.22.0
188+
enabled: false
202189
nonMasqueradeCIDR: 100.64.0.0/10
203190
podCIDR: 100.96.0.0/11
204191
secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-aws-ebs-csi-driver.addons.k8s.io-k8s-1.17_content

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,10 @@ spec:
11121112
- effect: NoExecute
11131113
operator: Exists
11141114
tolerationSeconds: 300
1115+
- key: node-role.kubernetes.io/master
1116+
operator: Exists
1117+
- key: node-role.kubernetes.io/control-plane
1118+
operator: Exists
11151119
topologySpreadConstraints:
11161120
- labelSelector:
11171121
matchLabels:

tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
version: 9.99.0
1515
- id: k8s-1.12
1616
manifest: coredns.addons.k8s.io/k8s-1.12.yaml
17-
manifestHash: 9c1ba47f3f8dccfb4e0a953f6cc108a92200ff2ee8c59563a4425e6b13ea0dbe
17+
manifestHash: a18378d9ec6288313eacc3da0f1ed7476ca11b63f5be41b32e8df9a64a884a5a
1818
name: coredns.addons.k8s.io
1919
selector:
2020
k8s-addon: coredns.addons.k8s.io
@@ -39,57 +39,6 @@ spec:
3939
selector:
4040
k8s-addon: dns-controller.addons.k8s.io
4141
version: 9.99.0
42-
- id: k8s-1.11
43-
manifest: node-termination-handler.aws/k8s-1.11.yaml
44-
manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70
45-
name: node-termination-handler.aws
46-
prune:
47-
kinds:
48-
- kind: ConfigMap
49-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
50-
- kind: Service
51-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
52-
- kind: ServiceAccount
53-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
54-
namespaces:
55-
- kube-system
56-
- group: admissionregistration.k8s.io
57-
kind: MutatingWebhookConfiguration
58-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
59-
- group: admissionregistration.k8s.io
60-
kind: ValidatingWebhookConfiguration
61-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
62-
- group: apps
63-
kind: DaemonSet
64-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
65-
- group: apps
66-
kind: Deployment
67-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
68-
namespaces:
69-
- kube-system
70-
- group: apps
71-
kind: StatefulSet
72-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
73-
- group: policy
74-
kind: PodDisruptionBudget
75-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
76-
namespaces:
77-
- kube-system
78-
- group: rbac.authorization.k8s.io
79-
kind: ClusterRole
80-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
81-
- group: rbac.authorization.k8s.io
82-
kind: ClusterRoleBinding
83-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
84-
- group: rbac.authorization.k8s.io
85-
kind: Role
86-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
87-
- group: rbac.authorization.k8s.io
88-
kind: RoleBinding
89-
labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
90-
selector:
91-
k8s-addon: node-termination-handler.aws
92-
version: 9.99.0
9342
- id: v1.15.0
9443
manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
9544
manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200
@@ -106,21 +55,19 @@ spec:
10655
version: 9.99.0
10756
- id: k8s-1.17
10857
manifest: aws-ebs-csi-driver.addons.k8s.io/k8s-1.17.yaml
109-
manifestHash: 3f2710ec98ff2c62bf6073d9ef1539ee3643bf14d91e40dfe50b2bb04dfde329
58+
manifestHash: 7252ac4317765fba0952341b3996690d1ae45c17e12b913e355c9684591b08af
11059
name: aws-ebs-csi-driver.addons.k8s.io
11160
selector:
11261
k8s-addon: aws-ebs-csi-driver.addons.k8s.io
11362
version: 9.99.0
11463
- id: k8s-1.19
11564
manifest: karpenter.sh/k8s-1.19.yaml
116-
manifestHash: 09f06376ef7bfcb706ec648daadae641bf9650d7ab10b6b58d7cd33c0c224867
65+
manifestHash: 26c813cafbe19cd0463de37601b1d9636fb20b8a31b8932f0dce77059dd7501c
11766
name: karpenter.sh
11867
prune:
11968
kinds:
12069
- kind: ConfigMap
12170
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
122-
namespaces:
123-
- kube-system
12471
- kind: Service
12572
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
12673
namespaces:
@@ -161,13 +108,11 @@ spec:
161108
kind: Role
162109
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
163110
namespaces:
164-
- kube-node-lease
165111
- kube-system
166112
- group: rbac.authorization.k8s.io
167113
kind: RoleBinding
168114
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
169115
namespaces:
170-
- kube-node-lease
171116
- kube-system
172117
selector:
173118
k8s-addon: karpenter.sh

0 commit comments

Comments
 (0)