Merge pull request #14318 from hakman/bastion_userdata_changes

Avoid spurious changes with bastion hosts due to user data

pkg/model/bootstrapscript.go

@@ -245,7 +245,7 @@ func (b *BootstrapScriptBuilder) ResourceNodeUp(c *fi.ModelBuilderContext, ig *k
 
 		// Bastions can have AdditionalUserData, but if there isn't any skip this part
 		if len(ig.Spec.AdditionalUserData) == 0 {
-			return fi.NewStringResource(""), nil
+			return nil, nil
 		}
 	}
 

tests/integration/update_cluster/private-shared-ip/cloudformation.json

@@ -366,8 +366,7 @@
                 }
               ]
             }
-          ],
+          ]
-          "UserData": "extracted"
         }
       }
     },

tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml

@@ -1,4 +1,3 @@
-Resources.AWSEC2LaunchTemplatebastionprivatesharedipexamplecom.Properties.LaunchTemplateData.UserData: ""
 Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Properties.LaunchTemplateData.UserData: |
   #!/bin/bash
   set -o errexit

tests/integration/update_cluster/privatecilium/cloudformation.json

@@ -428,8 +428,7 @@
                 }
               ]
             }
-          ],
+          ]
-          "UserData": "extracted"
         }
       }
     },

tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml

@@ -1,4 +1,3 @@
-Resources.AWSEC2LaunchTemplatebastionprivateciliumexamplecom.Properties.LaunchTemplateData.UserData: ""
 Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Properties.LaunchTemplateData.UserData: |
   #!/bin/bash
   set -o errexit

tests/integration/update_cluster/privatecilium2/cloudformation.json

@@ -400,8 +400,7 @@
                 }
               ]
             }
-          ],
+          ]
-          "UserData": "extracted"
         }
       }
     },

tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml

@@ -1,4 +1,3 @@
-Resources.AWSEC2LaunchTemplatebastionprivateciliumexamplecom.Properties.LaunchTemplateData.UserData: ""
 Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Properties.LaunchTemplateData.UserData: |
   #!/bin/bash
   set -o errexit

tests/integration/update_cluster/privateciliumadvanced/cloudformation.json

@@ -428,8 +428,7 @@
                 }
               ]
             }
-          ],
+          ]
-          "UserData": "extracted"
         }
       }
     },

tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml

@@ -1,4 +1,3 @@
-Resources.AWSEC2LaunchTemplatebastionprivateciliumadvancedexamplecom.Properties.LaunchTemplateData.UserData: ""
 Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplecom.Properties.LaunchTemplateData.UserData: |
   #!/bin/bash
   set -o errexit