Merge pull request #12709 from flouthoc/ign_add_certs

ignition: add `certs` from current user into the machine while `init`
This commit is contained in:
OpenShift Merge Robot
2022-01-04 19:12:05 +01:00
committed by GitHub

View File

@ -7,7 +7,10 @@ import (
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
"github.com/sirupsen/logrus"
)
/*
@ -355,6 +358,56 @@ machine_enabled=true
},
})
// get certs for current user
userHome, err := os.UserHomeDir()
if err != nil {
logrus.Warnf("Unable to copy certs via ignition %s", err.Error())
return files
}
certFiles := getCerts(filepath.Join(userHome, ".config/containers/certs.d"))
files = append(files, certFiles...)
certFiles = getCerts(filepath.Join(userHome, ".config/docker/certs.d"))
files = append(files, certFiles...)
return files
}
func getCerts(certsDir string) []File {
var (
files []File
)
certs, err := ioutil.ReadDir(certsDir)
if err == nil {
for _, cert := range certs {
b, err := ioutil.ReadFile(filepath.Join(certsDir, cert.Name()))
if err != nil {
logrus.Warnf("Unable to read cert file %s", err.Error())
continue
}
files = append(files, File{
Node: Node{
Group: getNodeGrp("root"),
Path: filepath.Join("/etc/containers/certs.d/", cert.Name()),
User: getNodeUsr("root"),
},
FileEmbedded1: FileEmbedded1{
Append: nil,
Contents: Resource{
Source: encodeDataURLPtr(string(b)),
},
Mode: intToPtr(0644),
},
})
}
} else {
if !os.IsNotExist(err) {
logrus.Warnf("Unable to copy certs via ignition, error while reading certs from %s: %s", certsDir, err.Error())
}
}
return files
}