File tree Expand file tree Collapse file tree 1 file changed +10
-3
lines changed
cloud/services/compute/instance Expand file tree Collapse file tree 1 file changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -89,17 +89,24 @@ func (s *Service) reconcileCloudInitUser(ctx context.Context) error {
8989// only c can be nil
9090func mergeUserDatas (a , b , c * infrav1.UserData ) (* infrav1.UserData , error ) {
9191 var err error
92+ var merged = & infrav1.UserData {}
9293 if c != nil {
93- c , err = cloudinit .MergeUserDatas (c , b )
94+ merged , err = cloudinit .MergeUserDatas (merged , c )
9495 if err != nil {
9596 return nil , err
9697 }
9798 }
98- c , err = cloudinit .MergeUserDatas (c , a )
99+
100+ merged , err = cloudinit .MergeUserDatas (merged , b )
101+ if err != nil {
102+ return nil , err
103+ }
104+
105+ merged , err = cloudinit .MergeUserDatas (merged , a )
99106 if err != nil {
100107 return nil , err
101108 }
102- return c , err
109+ return merged , err
103110}
104111
105112func userSnippetPath (vmName string ) string {
You can’t perform that action at this time.
0 commit comments