hack/update-expected.sh

Author: hakman

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

@@ -3,8 +3,9 @@
     {
       "Action": [
         "ec2:CreateFleet",
+        "ec2:CreateLaunchTemplate",
         "ec2:CreateTags",
-        "ec2:DescribeAvailabilityZones",
+        "ec2:DeleteLaunchTemplate",
         "ec2:DescribeImages",
         "ec2:DescribeInstanceTypeOfferings",
         "ec2:DescribeInstanceTypes",
@@ -15,7 +16,12 @@
         "ec2:DescribeSubnets",
         "ec2:RunInstances",
         "ec2:TerminateInstances",
+        "iam:AddRoleToInstanceProfile",
+        "iam:DeleteInstanceProfile",
+        "iam:GetInstanceProfile",
         "iam:PassRole",
+        "iam:RemoveRoleFromInstanceProfile",
+        "iam:TagInstanceProfile",
         "pricing:GetProducts",
         "ssm:GetParameter"
       ],

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

@@ -57,8 +57,7 @@ spec:
   karpenter:
     cpuRequest: 100m
     enabled: true
-    image: public.ecr.aws/karpenter/controller:v0.31.3
-    logEncoding: console
+    image: public.ecr.aws/karpenter/controller:1.6.2
     logLevel: debug
     memoryLimit: 2Gi
     memoryRequest: 500Mi
@@ -185,20 +184,7 @@ spec:
   networking:
     cni: {}
   nodeTerminationHandler:
-    cpuRequest: 50m
-    deleteSQSMsgIfNodeNotFound: false
-    enableRebalanceDraining: false
-    enableRebalanceMonitoring: false
-    enableScheduledEventDraining: true
-    enableSpotInterruptionDraining: true
-    enabled: true
-    excludeFromLoadBalancers: true
-    managedASGTag: aws-node-termination-handler/managed
-    memoryRequest: 64Mi
-    podTerminationGracePeriod: -1
-    prometheusEnable: false
-    taintNode: false
-    version: v1.22.0
+    enabled: false
   nonMasqueradeCIDR: 100.64.0.0/10
   podCIDR: 100.96.0.0/11
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets

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

@@ -39,57 +39,6 @@ spec:
     selector:
       k8s-addon: dns-controller.addons.k8s.io
     version: 9.99.0
-  - id: k8s-1.11
-    manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70
-    name: node-termination-handler.aws
-    prune:
-      kinds:
-      - kind: ConfigMap
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - kind: Service
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - kind: ServiceAccount
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-        namespaces:
-        - kube-system
-      - group: admissionregistration.k8s.io
-        kind: MutatingWebhookConfiguration
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: admissionregistration.k8s.io
-        kind: ValidatingWebhookConfiguration
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: apps
-        kind: DaemonSet
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: apps
-        kind: Deployment
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-        namespaces:
-        - kube-system
-      - group: apps
-        kind: StatefulSet
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: policy
-        kind: PodDisruptionBudget
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-        namespaces:
-        - kube-system
-      - group: rbac.authorization.k8s.io
-        kind: ClusterRole
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: rbac.authorization.k8s.io
-        kind: ClusterRoleBinding
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: rbac.authorization.k8s.io
-        kind: Role
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-      - group: rbac.authorization.k8s.io
-        kind: RoleBinding
-        labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-    selector:
-      k8s-addon: node-termination-handler.aws
-    version: 9.99.0
   - id: v1.15.0
     manifest: storage-aws.addons.k8s.io/v1.15.0.yaml
     manifestHash: 4e2cda50cd5048133aad1b5e28becb60f4629d3f9e09c514a2757c27998b4200
@@ -113,14 +62,12 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: karpenter.sh/k8s-1.19.yaml
-    manifestHash: 09f06376ef7bfcb706ec648daadae641bf9650d7ab10b6b58d7cd33c0c224867
+    manifestHash: 26c813cafbe19cd0463de37601b1d9636fb20b8a31b8932f0dce77059dd7501c
     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:
@@ -161,13 +108,11 @@ spec:
         kind: Role
         labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
         namespaces:
-        - kube-node-lease
         - kube-system
       - group: rbac.authorization.k8s.io
         kind: RoleBinding
         labelSelector: addon.kops.k8s.io/name=karpenter.sh,app.kubernetes.io/managed-by=kops
         namespaces:
-        - kube-node-lease
         - kube-system
     selector:
       k8s-addon: karpenter.sh