Merge pull request #14320 from hakman/automated-cherry-pick-of-#14318…

…-upstream-release-1.25 Automated cherry pick of #14318: Avoid spurious changes with bastion hosts due to user
kubernetes · Sep 24, 2022 · 978ebe0 · 978ebe0
2 parents ee5300c + 0b3e892
commit 978ebe0
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 13 deletions.
diff --git a/pkg/model/bootstrapscript.go b/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
 		}
 	}
 

diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json b/tests/integration/update_cluster/private-shared-ip/cloudformation.json
@@ -366,8 +366,7 @@
                 }
               ]
             }
-          ],
-          "UserData": "extracted"
+          ]
         }
       }
     },

diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/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

diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json b/tests/integration/update_cluster/privatecilium/cloudformation.json
@@ -428,8 +428,7 @@
                 }
               ]
             }
-          ],
-          "UserData": "extracted"
+          ]
         }
       }
     },

diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/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

diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json
@@ -400,8 +400,7 @@
                 }
               ]
             }
-          ],
-          "UserData": "extracted"
+          ]
         }
       }
     },

diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/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

diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json
@@ -428,8 +428,7 @@
                 }
               ]
             }
-          ],
-          "UserData": "extracted"
+          ]
         }
       }
     },

diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -366,8 +366,7 @@ @@
                     }
                   ]
                 }
-              ],
-              "UserData": "extracted"
+              ]
             }
           }
         },
@@ Expand Down @@