rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-15 07:41:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2304 from Jason-ZW/fix-cloudinitexecute-decoding-bug

Browse Source 
Add decode logic for writefiles
This commit is contained in:
niusmallnan 2018-03-26 15:12:59 +08:00 committed by GitHub
commit 9389687557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/cloudinitexecute/cloudinitexecute.go
View File

@ -10,6 +10,7 @@ import (
"strings" "strings"
rancherConfig "github.com/rancher/os/config" rancherConfig "github.com/rancher/os/config"
"github.com/rancher/os/config/cloudinit/config"
"github.com/rancher/os/config/cloudinit/system" "github.com/rancher/os/config/cloudinit/system"
"github.com/rancher/os/docker" "github.com/rancher/os/docker"
"github.com/rancher/os/log" "github.com/rancher/os/log"
@ -124,6 +125,14 @@ func WriteFiles(cfg *rancherConfig.CloudConfig, container string) {
continue continue
} }
content, err := config.DecodeContent(file.File.Content, file.File.Encoding)
if err != nil {
continue
}
file.File.Content = string(content)
file.File.Encoding = ""
f := system.File{ f := system.File{
File: file.File, File: file.File,
} }