Skip to content

Commit 096f26e

Browse files
hakmanhakman
committed
hack/update-expected.sh
1 parent adc361f commit 096f26e

7 files changed

+1728
-1432
lines changed

‎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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ spec:
5757
karpenter:
5858
cpuRequest: 100m
5959
enabled: true
60-
image: public.ecr.aws/karpenter/controller:v0.31.3
61-
logEncoding: console
60+
image: public.ecr.aws/karpenter/controller:1.6.2
6261
logLevel: debug
6362
memoryLimit: 2Gi
6463
memoryRequest: 500Mi

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,12 @@ spec:
113113
version: 9.99.0
114114
- id: k8s-1.19
115115
manifest: karpenter.sh/k8s-1.19.yaml
116-
manifestHash: 09f06376ef7bfcb706ec648daadae641bf9650d7ab10b6b58d7cd33c0c224867
116+
manifestHash: 26c813cafbe19cd0463de37601b1d9636fb20b8a31b8932f0dce77059dd7501c
117117
name: karpenter.sh
118118
prune:
119119
kinds:
120120
- kind: ConfigMap
121121
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
122-
namespaces:
123-
- kube-system
124122
- kind: Service
125123
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
126124
namespaces:
@@ -161,13 +159,11 @@ spec:
161159
kind: Role
162160
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
163161
namespaces:
164-
- kube-node-lease
165162
- kube-system
166163
- group: rbac.authorization.k8s.io
167164
kind: RoleBinding
168165
labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
169166
namespaces:
170-
- kube-node-lease
171167
- kube-system
172168
selector:
173169
k8s-addon: karpenter.sh

‎tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content‎

Lines changed: 1703 additions & 1274 deletions
Large diffs are not rendered by default.

‎tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data‎ renamed to ‎tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupscript-karpenter-nodes-default_content‎

File renamed without changes.

‎tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data‎ renamed to ‎tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupscript-karpenter-nodes-single-machinetype_content‎

File renamed without changes.

‎tests/integration/update_cluster/karpenter/kubernetes.tf‎

Lines changed: 16 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -552,156 +552,6 @@ resource "aws_key_pair" "kubernetes-minimal-example-com-c4a6ed9aa889b9e2c39cd663
552552
}
553553
}
554554

555-
resource "aws_launch_template" "karpenter-nodes-default-minimal-example-com" {
556-
block_device_mappings {
557-
device_name = "/dev/xvda"
558-
ebs {
559-
delete_on_termination = true
560-
encrypted = true
561-
iops = 3000
562-
throughput = 125
563-
volume_size = 128
564-
volume_type = "gp3"
565-
}
566-
}
567-
iam_instance_profile {
568-
name = aws_iam_instance_profile.nodes-minimal-example-com.id
569-
}
570-
image_id = "ami-12345678"
571-
key_name = aws_key_pair.kubernetes-minimal-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id
572-
lifecycle {
573-
create_before_destroy = true
574-
}
575-
metadata_options {
576-
http_endpoint = "enabled"
577-
http_protocol_ipv6 = "disabled"
578-
http_put_response_hop_limit = 1
579-
http_tokens = "required"
580-
}
581-
monitoring {
582-
enabled = false
583-
}
584-
name = "karpenter-nodes-default.minimal.example.com"
585-
network_interfaces {
586-
associate_public_ip_address = true
587-
delete_on_termination = true
588-
ipv6_address_count = 0
589-
security_groups = [aws_security_group.nodes-minimal-example-com.id]
590-
}
591-
tag_specifications {
592-
resource_type = "instance"
593-
tags = {
594-
"KubernetesCluster" = "minimal.example.com"
595-
"Name" = "karpenter-nodes-default.minimal.example.com"
596-
"aws-node-termination-handler/managed" = ""
597-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
598-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
599-
"k8s.io/role/node" = "1"
600-
"kops.k8s.io/instancegroup" = "karpenter-nodes-default"
601-
"kubernetes.io/cluster/minimal.example.com" = "owned"
602-
}
603-
}
604-
tag_specifications {
605-
resource_type = "volume"
606-
tags = {
607-
"KubernetesCluster" = "minimal.example.com"
608-
"Name" = "karpenter-nodes-default.minimal.example.com"
609-
"aws-node-termination-handler/managed" = ""
610-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
611-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
612-
"k8s.io/role/node" = "1"
613-
"kops.k8s.io/instancegroup" = "karpenter-nodes-default"
614-
"kubernetes.io/cluster/minimal.example.com" = "owned"
615-
}
616-
}
617-
tags = {
618-
"KubernetesCluster" = "minimal.example.com"
619-
"Name" = "karpenter-nodes-default.minimal.example.com"
620-
"aws-node-termination-handler/managed" = ""
621-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
622-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
623-
"k8s.io/role/node" = "1"
624-
"kops.k8s.io/instancegroup" = "karpenter-nodes-default"
625-
"kubernetes.io/cluster/minimal.example.com" = "owned"
626-
}
627-
user_data = filebase64("${path.module}/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data")
628-
}
629-
630-
resource "aws_launch_template" "karpenter-nodes-single-machinetype-minimal-example-com" {
631-
block_device_mappings {
632-
device_name = "/dev/xvda"
633-
ebs {
634-
delete_on_termination = true
635-
encrypted = true
636-
iops = 3000
637-
throughput = 125
638-
volume_size = 128
639-
volume_type = "gp3"
640-
}
641-
}
642-
iam_instance_profile {
643-
name = aws_iam_instance_profile.nodes-minimal-example-com.id
644-
}
645-
image_id = "ami-12345678"
646-
key_name = aws_key_pair.kubernetes-minimal-example-com-c4a6ed9aa889b9e2c39cd663eb9c7157.id
647-
lifecycle {
648-
create_before_destroy = true
649-
}
650-
metadata_options {
651-
http_endpoint = "enabled"
652-
http_protocol_ipv6 = "disabled"
653-
http_put_response_hop_limit = 1
654-
http_tokens = "required"
655-
}
656-
monitoring {
657-
enabled = false
658-
}
659-
name = "karpenter-nodes-single-machinetype.minimal.example.com"
660-
network_interfaces {
661-
associate_public_ip_address = true
662-
delete_on_termination = true
663-
ipv6_address_count = 0
664-
security_groups = [aws_security_group.nodes-minimal-example-com.id]
665-
}
666-
tag_specifications {
667-
resource_type = "instance"
668-
tags = {
669-
"KubernetesCluster" = "minimal.example.com"
670-
"Name" = "karpenter-nodes-single-machinetype.minimal.example.com"
671-
"aws-node-termination-handler/managed" = ""
672-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
673-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
674-
"k8s.io/role/node" = "1"
675-
"kops.k8s.io/instancegroup" = "karpenter-nodes-single-machinetype"
676-
"kubernetes.io/cluster/minimal.example.com" = "owned"
677-
}
678-
}
679-
tag_specifications {
680-
resource_type = "volume"
681-
tags = {
682-
"KubernetesCluster" = "minimal.example.com"
683-
"Name" = "karpenter-nodes-single-machinetype.minimal.example.com"
684-
"aws-node-termination-handler/managed" = ""
685-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
686-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
687-
"k8s.io/role/node" = "1"
688-
"kops.k8s.io/instancegroup" = "karpenter-nodes-single-machinetype"
689-
"kubernetes.io/cluster/minimal.example.com" = "owned"
690-
}
691-
}
692-
tags = {
693-
"KubernetesCluster" = "minimal.example.com"
694-
"Name" = "karpenter-nodes-single-machinetype.minimal.example.com"
695-
"aws-node-termination-handler/managed" = ""
696-
"k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
697-
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
698-
"k8s.io/role/node" = "1"
699-
"kops.k8s.io/instancegroup" = "karpenter-nodes-single-machinetype"
700-
"kubernetes.io/cluster/minimal.example.com" = "owned"
701-
}
702-
user_data = filebase64("${path.module}/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data")
703-
}
704-
705555
resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" {
706556
block_device_mappings {
707557
device_name = "/dev/xvda"
@@ -1080,6 +930,22 @@ resource "aws_s3_object" "nodeupconfig-nodes" {
1080930
server_side_encryption = "AES256"
1081931
}
1082932

933+
resource "aws_s3_object" "nodeupscript-karpenter-nodes-default" {
934+
bucket = "testingBucket"
935+
content = file("${path.module}/data/aws_s3_object_nodeupscript-karpenter-nodes-default_content")
936+
key = "clusters.example.com/minimal.example.com/igconfig/node/karpenter-nodes-default/nodeupscript.sh"
937+
provider = aws.files
938+
server_side_encryption = "AES256"
939+
}
940+
941+
resource "aws_s3_object" "nodeupscript-karpenter-nodes-single-machinetype" {
942+
bucket = "testingBucket"
943+
content = file("${path.module}/data/aws_s3_object_nodeupscript-karpenter-nodes-single-machinetype_content")
944+
key = "clusters.example.com/minimal.example.com/igconfig/node/karpenter-nodes-single-machinetype/nodeupscript.sh"
945+
provider = aws.files
946+
server_side_encryption = "AES256"
947+
}
948+
1083949
resource "aws_security_group" "masters-minimal-example-com" {
1084950
description = "Security group for masters"
1085951
name = "masters.minimal.example.com"

0 commit comments

Comments
 (0)