Alpha

cluster/etcd-cluster.yaml

@@ -1,6 +1,7 @@
 SenzaComponents:
 - Configuration:
     Type: Senza::StupsAutoConfiguration
+    DefineParameters: false # skip CF template parameter definition
 - AppServer:
     IamRoles:
     - Ref: EtcdRole

cluster/manifests/kube-node-ready/daemonset.yaml

@@ -28,10 +28,9 @@ spec:
         effect: NoSchedule
       containers:
       - name: kube-node-ready
-        image: registry.opensource.zalan.do/teapot/kube-node-ready:9799c3d
+        image: registry.opensource.zalan.do/teapot/kube-node-ready:v0.0.1
         args:
-        - --master-lifecycle-hook={{ .Outputs.MasterAutoscalingLifecycleHook }}
-        - --worker-lifecycle-hook={{ .Outputs.WorkerAutoscalingLifecycleHook }}
+        - --lifecycle-hook=kube-node-ready-lifecycle-hook
         resources:
           limits:
             cpu: 50m

cluster/senza-definition.yaml

@@ -677,6 +677,7 @@ Resources:
             - "apigateway:*"
             - "automation:*"
             - "autoscaling:*"
+            - "application-autoscaling:*"
             - "aws-marketplace:View*"
             - "aws-portal:View*"
             - "cloudformation:*"
@@ -787,15 +788,16 @@ Resources:
       HeartbeatTimeout: "600"
       AutoScalingGroupName:
         Ref: MasterAutoScaling
+      LifecycleHookName: "kube-node-ready-lifecycle-hook"
       LifecycleTransition: "autoscaling:EC2_INSTANCE_LAUNCHING"
   WorkerAutoscalingLifecycleHook:
     Type: "AWS::AutoScaling::LifecycleHook"
     Properties:
       DefaultResult: "CONTINUE"
       HeartbeatTimeout: "600"
       AutoScalingGroupName:
-        Ref:
-          WorkerAutoScaling
+        Ref: WorkerAutoScaling
+      LifecycleHookName: "kube-node-ready-lifecycle-hook"
       LifecycleTransition: "autoscaling:EC2_INSTANCE_LAUNCHING"
   KubeReadyIAMRole:
     Type: AWS::IAM::Role
@@ -873,10 +875,3 @@ Resources:
             Resource: ["arn:aws:s3:::{{ Arguments.EtcdS3BackupBucket }}/*"]
           Version: '2012-10-17'
         PolicyName: root
-Outputs:
-  MasterAutoscalingLifecycleHook:
-    Value:
-      Ref: MasterAutoscalingLifecycleHook
-  WorkerAutoscalingLifecycleHook:
-    Value:
-      Ref: WorkerAutoscalingLifecycleHook