From 6ac8a24db4ab3e2bbc85feca2bee8cb1c868c7f6 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Thu, 26 Apr 2018 11:29:02 -0400 Subject: Add --default-mounts-file hidden flag The hidden flag is used to override the path of the default mounts file for testing purposes. Also modified the secrets pkg to allow for this override to happen. Signed-off-by: umohnani8 Closes: #678 Approved by: mheon --- pkg/secrets/secrets.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkg/secrets') diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go index 9b328575b..54d1ae5ad 100644 --- a/pkg/secrets/secrets.go +++ b/pkg/secrets/secrets.go @@ -127,10 +127,15 @@ func getMountsMap(path string) (string, string, error) { } // SecretMounts copies, adds, and mounts the secrets to the container root filesystem -func SecretMounts(mountLabel, containerWorkingDir string) []rspec.Mount { +func SecretMounts(mountLabel, containerWorkingDir string, mountFile []string) []rspec.Mount { var secretMounts []rspec.Mount // Add secrets from paths given in the mounts.conf files - for _, file := range []string{OverrideMountsFile, DefaultMountsFile} { + // mountFile will have a value if the hidden --default-mounts-file flag is set + // Note for testing purposes only + if len(mountFile) == 0 { + mountFile = append(mountFile, []string{OverrideMountsFile, DefaultMountsFile}...) + } + for _, file := range mountFile { mounts, err := addSecretsFromMountsFile(file, mountLabel, containerWorkingDir) if err != nil { logrus.Warnf("error mounting secrets, skipping: %v", err) -- cgit v1.2.3-54-g00ecf