Merge pull request #8549 from zalando-incubator/drop-kube-node-ready

Drop kube-node-ready

Author: demonCoder95

cluster/config-defaults.yaml

@@ -484,9 +484,6 @@ kubernetes_lifecycle_metrics_mem_min: "120Mi"
 kube_node_ready_controller_cpu: "50m"
 kube_node_ready_controller_memory: "200Mi"
 
-# Enable kube-node-ready ASG lifecycle hook feature.
-kube_node_ready_enabled: "true"
-
 # Enable deployment of aws-cloud-controller-manager
 aws_cloud_controller_manager_enabled: "true"
 aws_cloud_controller_manager_cpu: "125m"
@@ -778,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
@@ -1135,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/deletions.yaml

@@ -309,17 +309,6 @@ post_apply:
   kind: DaemonSet
   namespace: kube-system
 {{- end }}
-{{- if ne .Cluster.ConfigItems.kube_node_ready_enabled "true" }}
-- name: kube-node-ready
-  kind: DaemonSet
-  namespace: kube-system
-- name: kube-node-ready
-  kind: ServiceAccount
-  namespace: kube-system
-- name: kube-node-ready
-  kind: Service
-  namespace: kube-system
-{{- end }}
 {{- if ne .Cluster.ConfigItems.role_sync_controller_enabled "true" }}
 - name: role-sync-controller
   kind: CronJob

cluster/manifests/kube-node-ready/01-rbac.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/manifests/kube-node-ready/daemonset.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/manifests/kube-node-ready/service.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
 

cluster/manifests/kube2iam/daemonset.yaml

@@ -174,13 +174,3 @@ Resources:
       Roles:
       - !ImportValue '{{ .Cluster.ID }}:worker-iam-role'
     Type: 'AWS::IAM::InstanceProfile'
-# {{ if eq .Cluster.ConfigItems.kube_node_ready_enabled "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/stack.yaml

@@ -125,16 +125,6 @@ Resources:
       VPCZoneIdentifier:
         - "{{ index $data.Values.subnets $az }}"
     Type: 'AWS::AutoScaling::AutoScalingGroup'
-# {{ if eq $data.Cluster.ConfigItems.kube_node_ready_enabled "true" }}
-  AutoscalingLifecycleHook{{$azID}}:
-    Properties:
-      AutoScalingGroupName: !Ref AutoScalingGroup{{$azID}}
-      LifecycleHookName: "kube-node-ready-lifecycle-hook"
-      DefaultResult: CONTINUE
-      HeartbeatTimeout: '600'
-      LifecycleTransition: 'autoscaling:EC2_INSTANCE_LAUNCHING'
-    Type: 'AWS::AutoScaling::LifecycleHook'
-# {{ end }}
 {{ end }}
 {{ end }}
 {{ end }}