fix after submodule update: pass NodeInstanceRoleArn to nodegroup tem…

…plate
darinpope · Apr 1, 2020 · a23b9be · a23b9be
1 parent 1c87ff6
commit a23b9be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/templates/cloudbees-core-addl-nodes.template.yaml b/templates/cloudbees-core-addl-nodes.template.yaml
@@ -541,6 +541,8 @@ Parameters:
     Type: String
   NodeInstanceRoleName:
     Type: String
+  NodeInstanceRoleArn:
+    Type: String
   KubernetesVersion: 
     Type: String
   QSS3BucketName:
@@ -592,6 +594,7 @@ Resources:
         ControlPlaneSecurityGroup: !Ref ControlPlaneSecurityGroup
         NodeInstanceProfile: !Ref NodeInstanceProfile
         NodeInstanceRoleName: !Ref NodeInstanceRoleName
+        NodeInstanceRoleArn: !Ref NodeInstanceRoleArn
         KubernetesVersion: !Ref KubernetesVersion
         BootstrapArguments: "--kubelet-extra-args '--node-labels=partition=regular-agents --register-with-taints=partition=regular-agents:NoSchedule'"
   SpotAgentNodesStack:

diff --git a/templates/cloudbees-core-existing-vpc.template.yaml b/templates/cloudbees-core-existing-vpc.template.yaml
@@ -923,6 +923,7 @@ Resources:
         BastionSecurityGroup: !GetAtt EKSStack.Outputs.BastionSecurityGroup
         NodeInstanceProfile: !GetAtt EKSStack.Outputs.NodeInstanceProfile
         NodeInstanceRoleName: !GetAtt EKSStack.Outputs.NodeInstanceRoleName
+        NodeInstanceRoleArn: !GetAtt EKSStack.Outputs.NodeInstanceRoleArn
         KubernetesVersion: !Ref KubernetesVersion
         QSS3BucketName: !Ref QSS3BucketName
         QSS3KeyPrefix: !Ref QSS3KeyPrefix