opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename addFIPSsModeSecret to addFIPSModeSecret

Browse Source 
Signed-off-by: Jhon Honce <jhonce@redhat.com>

Closes: #833
Approved by: mheon
This commit is contained in:
Jhon Honce
2018-05-25 09:26:13 -07:00
committed by Atomic Bot
parent de13777e71
commit 8fcf1aaa29
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/secrets/secrets.go
View File

@ -156,7 +156,7 @@ func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPre
// Add FIPS mode secret if /etc/system-fips exists on the host // Add FIPS mode secret if /etc/system-fips exists on the host
_, err := os.Stat("/etc/system-fips") _, err := os.Stat("/etc/system-fips")
if err == nil { if err == nil {
if err := addFIPSsModeSecret(&secretMounts, containerWorkingDir); err != nil { if err := addFIPSModeSecret(&secretMounts, containerWorkingDir); err != nil {
logrus.Warnf("error adding FIPS mode secret to container: %v", err) logrus.Warnf("error adding FIPS mode secret to container: %v", err)
} }
} else if os.IsNotExist(err) { } else if os.IsNotExist(err) {
@ -237,11 +237,11 @@ func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir, mountPr
return mounts, nil return mounts, nil
} }
// addFIPSsModeSecret creates /run/secrets/system-fips in the container // addFIPSModeSecret creates /run/secrets/system-fips in the container
// root filesystem if /etc/system-fips exists on hosts. // root filesystem if /etc/system-fips exists on hosts.
// This enables the container to be FIPS compliant and run openssl in // This enables the container to be FIPS compliant and run openssl in
// FIPS mode as the host is also in FIPS mode. // FIPS mode as the host is also in FIPS mode.
func addFIPSsModeSecret(mounts *[]rspec.Mount, containerWorkingDir string) error { func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir string) error {
secretsDir := "/run/secrets" secretsDir := "/run/secrets"
ctrDirOnHost := filepath.Join(containerWorkingDir, secretsDir) ctrDirOnHost := filepath.Join(containerWorkingDir, secretsDir)
if _, err := os.Stat(ctrDirOnHost); os.IsNotExist(err) { if _, err := os.Stat(ctrDirOnHost); os.IsNotExist(err) {