Skip to content

Commit 291a3e2

Browse files
authored
Merge pull request #86 from simplysoft/fix/empty-cloud-init
Correctly merge user data
2 parents 6c96ee9 + 7638786 commit 291a3e2

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

cloud/services/compute/instance/cloudinit.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,24 @@ func (s *Service) reconcileCloudInitUser(ctx context.Context) error {
8989
// only c can be nil
9090
func 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

105112
func userSnippetPath(vmName string) string {

0 commit comments

Comments
 (0)