./hack/update-expected.sh

rifelpet · Aug 18, 2024 · b9b601c · b9b601c
1 parent 723ec6d
commit b9b601c
Show file tree

Hide file tree

Showing 8 changed files with 3,379 additions and 1,001 deletions.
diff --git a/.../karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/.../karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
@@ -153,7 +153,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-default
 InstanceGroupRole: Node
-NodeupConfigHash: B5rzCKtE6ohaJMn5dHwp4M7fyRbxz6OXfR9LzdQ/e5c=
+NodeupConfigHash: JVAAsN3tX9eYDcFEzz8jRw325wWlYeqt//yHdS73qk4=
 
 __EOF_KUBE_ENV
 

diff --git a/...data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/...data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
@@ -153,7 +153,7 @@ ConfigServer:
   - https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: karpenter-nodes-single-machinetype
 InstanceGroupRole: Node
-NodeupConfigHash: tycZwbphxXfkC5C+Ysp9n6kzd1QNHlj3nq2zTckmz0c=
+NodeupConfigHash: ENv8wgAF56Ga7fH/Pjix6bgcqqhv8Xo+plwQWGQEcCM=
 
 __EOF_KUBE_ENV
 

diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
@@ -57,7 +57,7 @@ spec:
   karpenter:
     cpuRequest: 100m
     enabled: true
-    image: public.ecr.aws/karpenter/controller:v0.31.3
+    image: public.ecr.aws/karpenter/controller:1.0.0
     logEncoding: console
     logLevel: debug
     memoryLimit: 2Gi

diff --git a/.../update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/.../update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
@@ -120,14 +120,12 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: karpenter.sh/k8s-1.19.yaml
-    manifestHash: 09f06376ef7bfcb706ec648daadae641bf9650d7ab10b6b58d7cd33c0c224867
+    manifestHash: 740427b550c216a98b589b70835a909dc7a79e62b3abf3e41e0a32efdbaa96b6
     name: karpenter.sh
     prune:
       kinds:
       - kind: ConfigMap
         labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
-        namespaces:
-        - kube-system
       - kind: Service
         labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
         namespaces:

diff --git a/...ter/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content b/...ter/karpenter/data/aws_s3_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content
diff --git a/.../update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/.../update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content
@@ -46,6 +46,7 @@ KubeletConfig:
   logLevel: 2
   maxPods: 50
   nodeLabels:
+    foo: baz
     karpenter.sh/provisioner-name: karpenter-nodes-default
     node-role.kubernetes.io/node: ""
   podInfraContainerImage: registry.k8s.io/pause:3.9

diff --git a/...ster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/...ster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content
@@ -42,6 +42,7 @@ KubeletConfig:
   kubeconfigPath: /var/lib/kubelet/kubeconfig
   logLevel: 2
   nodeLabels:
+    foo: bar
     karpenter.sh/provisioner-name: karpenter-nodes-single-machinetype
     node-role.kubernetes.io/node: ""
   podInfraContainerImage: registry.k8s.io/pause:3.9

diff --git a/tests/integration/update_cluster/karpenter/kubernetes.tf b/tests/integration/update_cluster/karpenter/kubernetes.tf
@@ -594,6 +594,7 @@ resource "aws_launch_template" "karpenter-nodes-default-minimal-example-com" {
       "KubernetesCluster"                                                           = "minimal.example.com"
       "Name"                                                                        = "karpenter-nodes-default.minimal.example.com"
       "aws-node-termination-handler/managed"                                        = ""
+      "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "baz"
       "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
       "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
       "k8s.io/role/node"                                                            = "1"
@@ -607,6 +608,7 @@ resource "aws_launch_template" "karpenter-nodes-default-minimal-example-com" {
       "KubernetesCluster"                                                           = "minimal.example.com"
       "Name"                                                                        = "karpenter-nodes-default.minimal.example.com"
       "aws-node-termination-handler/managed"                                        = ""
+      "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "baz"
       "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
       "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
       "k8s.io/role/node"                                                            = "1"
@@ -618,6 +620,7 @@ resource "aws_launch_template" "karpenter-nodes-default-minimal-example-com" {
     "KubernetesCluster"                                                           = "minimal.example.com"
     "Name"                                                                        = "karpenter-nodes-default.minimal.example.com"
     "aws-node-termination-handler/managed"                                        = ""
+    "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "baz"
     "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-default"
     "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
     "k8s.io/role/node"                                                            = "1"
@@ -633,12 +636,23 @@ resource "aws_launch_template" "karpenter-nodes-single-machinetype-minimal-examp
     ebs {
       delete_on_termination = true
       encrypted             = true
-      iops                  = 3000
-      throughput            = 125
-      volume_size           = 128
+      iops                  = 4000
+      kms_key_id            = "arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab"
+      throughput            = 200
+      volume_size           = 200
       volume_type           = "gp3"
     }
   }
+  block_device_mappings {
+    device_name = "/dev/xvdd"
+    ebs {
+      delete_on_termination = true
+      encrypted             = true
+      kms_key_id            = "arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab"
+      volume_size           = 20
+      volume_type           = "gp2"
+    }
+  }
   iam_instance_profile {
     name = aws_iam_instance_profile.nodes-minimal-example-com.id
   }
@@ -669,6 +683,7 @@ resource "aws_launch_template" "karpenter-nodes-single-machinetype-minimal-examp
       "KubernetesCluster"                                                           = "minimal.example.com"
       "Name"                                                                        = "karpenter-nodes-single-machinetype.minimal.example.com"
       "aws-node-termination-handler/managed"                                        = ""
+      "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "bar"
       "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
       "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
       "k8s.io/role/node"                                                            = "1"
@@ -682,6 +697,7 @@ resource "aws_launch_template" "karpenter-nodes-single-machinetype-minimal-examp
       "KubernetesCluster"                                                           = "minimal.example.com"
       "Name"                                                                        = "karpenter-nodes-single-machinetype.minimal.example.com"
       "aws-node-termination-handler/managed"                                        = ""
+      "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "bar"
       "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
       "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
       "k8s.io/role/node"                                                            = "1"
@@ -693,6 +709,7 @@ resource "aws_launch_template" "karpenter-nodes-single-machinetype-minimal-examp
     "KubernetesCluster"                                                           = "minimal.example.com"
     "Name"                                                                        = "karpenter-nodes-single-machinetype.minimal.example.com"
     "aws-node-termination-handler/managed"                                        = ""
+    "k8s.io/cluster-autoscaler/node-template/label/foo"                           = "bar"
     "k8s.io/cluster-autoscaler/node-template/label/karpenter.sh/provisioner-name" = "karpenter-nodes-single-machinetype"
     "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"  = ""
     "k8s.io/role/node"                                                            = "1"