Drop control_plane_asg_lifecycle_hook

Signed-off-by: Mikkel Oscar Lyderik Larsen <[email protected]>

Author: mikkeloscar

cluster/config-defaults.yaml

@@ -775,8 +775,6 @@ kube2iam_cpu: "25m"
 kube2iam_memory: "100Mi"
 
 # configure whether kube2iam should only run on worker nodes.
-# This depends on control_plane_asg_lifecycle_hook=false as kube-node-ready
-# doesn't work without kube2iam.
 kube2iam_worker_only: "true"
 
 # CIDR configuration for nodes and pods
@@ -1132,9 +1130,6 @@ apiserver_memory_limit_percent: "80"
 
 apiserver_max_requests_inflight: "400"
 
-# specify if control plane nodes should rely on ASG Lifecycle Hook or not
-control_plane_asg_lifecycle_hook: "false"
-
 # enable graceful shutdown on the control_plane nodes
 control_plane_graceful_shutdown: "true"
 

cluster/manifests/kube2iam/daemonset.yaml

@@ -21,7 +21,7 @@ spec:
       annotations:
         logging/destination: "{{.Cluster.ConfigItems.log_destination_infra}}"
     spec:
-{{- if and (eq .Cluster.ConfigItems.kube2iam_worker_only "true") (eq .Cluster.ConfigItems.control_plane_asg_lifecycle_hook "false") }}
+{{- if eq .Cluster.ConfigItems.kube2iam_worker_only "true" }}
       nodeSelector:
         node.kubernetes.io/role: worker
 {{- end }}

cluster/node-pools/master-default/stack.yaml

@@ -101,13 +101,3 @@ Resources:
       Roles:
       - !ImportValue '{{ .Cluster.ID }}:master-iam-role'
     Type: 'AWS::IAM::InstanceProfile'
-{{- if eq .Cluster.ConfigItems.control_plane_asg_lifecycle_hook "true" }}
-  AutoscalingLifecycleHook:
-    Properties:
-      AutoScalingGroupName: !Ref AutoScalingGroup
-      LifecycleHookName: "kube-node-ready-lifecycle-hook"
-      DefaultResult: CONTINUE
-      HeartbeatTimeout: '600'
-      LifecycleTransition: 'autoscaling:EC2_INSTANCE_LAUNCHING'
-    Type: 'AWS::AutoScaling::LifecycleHook'
-{{- end }}

cluster/node-pools/master-default/userdata.yaml

@@ -4,7 +4,7 @@ write_files:
     path: /etc/kubernetes/secrets.env
     content: |
       NODEPOOL_TAINTS=node.kubernetes.io/role=master:NoSchedule{{if index .NodePool.ConfigItems "taints"}},{{.NodePool.ConfigItems.taints}}{{end}}
-      NODE_LABELS=master=true,node.kubernetes.io/exclude-from-external-load-balancers,node.kubernetes.io/distro=ubuntu,cluster-lifecycle-controller.zalan.do/decommission-priority=999,lifecycle-status=ready{{if index .NodePool.ConfigItems "labels"}},{{.NodePool.ConfigItems.labels}}{{end}}{{if eq .Cluster.ConfigItems.control_plane_asg_lifecycle_hook "true" }},asg-lifecycle-hook=true{{end}}
+      NODE_LABELS=master=true,node.kubernetes.io/exclude-from-external-load-balancers,node.kubernetes.io/distro=ubuntu,cluster-lifecycle-controller.zalan.do/decommission-priority=999,lifecycle-status=ready{{if index .NodePool.ConfigItems "labels"}},{{.NodePool.ConfigItems.labels}}{{end}}
       NODEPOOL_NAME={{ .NodePool.Name }}
       KUBELET_ROLE=master