kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 10:30:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Allow setting shell and timeout in generatorOptions

Browse Source
This commit is contained in:
Jingfang Liu
2018-10-22 11:16:51 -07:00
parent a8e393496f
commit fdf5fa58d3
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/k8sdeps/configmapandsecret/secretfactory.go
View File

@@ -19,6 +19,7 @@ package configmapandsecret
import ( import (
"context" "context"
"fmt" "fmt"
"log"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -67,10 +68,11 @@ func (f *SecretFactory) MakeSecret(args *types.SecretArgs, options *types.Genera
timeout := defaultCommandTimeout timeout := defaultCommandTimeout
if args.TimeoutSeconds != nil { if args.TimeoutSeconds != nil {
log.Println("SecretArgs.TimeoutSeconds will be deprected in next release. Please use GeneratorOptions.TimeoutSeconds instread.")
timeout = time.Duration(*args.TimeoutSeconds) * time.Second timeout = time.Duration(*args.TimeoutSeconds) * time.Second
} }
pairs, err := f.keyValuesFromEnvFileCommand(args.EnvCommand, timeout) pairs, err := f.keyValuesFromEnvFileCommand(args.EnvCommand, timeout, options)
if err != nil { if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf( return nil, errors.Wrap(err, fmt.Sprintf(
"env source file: %s", "env source file: %s",
@@ -78,7 +80,7 @@ func (f *SecretFactory) MakeSecret(args *types.SecretArgs, options *types.Genera
} }
all = append(all, pairs...) all = append(all, pairs...)
pairs, err = f.keyValuesFromCommands(args.Commands, timeout) pairs, err = f.keyValuesFromCommands(args.Commands, timeout, options)
if err != nil { if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf( return nil, errors.Wrap(err, fmt.Sprintf(
"commands %v", args.Commands)) "commands %v", args.Commands))
@@ -110,18 +112,18 @@ func addKvToSecret(secret *corev1.Secret, keyName, data string) error {
return nil return nil
} }
func (f *SecretFactory) keyValuesFromEnvFileCommand(cmd string, timeout time.Duration) ([]kvPair, error) { func (f *SecretFactory) keyValuesFromEnvFileCommand(cmd string, timeout time.Duration, options *types.GeneratorOptions) ([]kvPair, error) {
content, err := f.createSecretKey(cmd, timeout) content, err := f.createSecretKey(cmd, timeout, options)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return keyValuesFromLines(content) return keyValuesFromLines(content)
} }
func (f *SecretFactory) keyValuesFromCommands(sources map[string]string, timeout time.Duration) ([]kvPair, error) { func (f *SecretFactory) keyValuesFromCommands(sources map[string]string, timeout time.Duration, options *types.GeneratorOptions) ([]kvPair, error) {
var kvs []kvPair var kvs []kvPair
for k, cmd := range sources { for k, cmd := range sources {
content, err := f.createSecretKey(cmd, timeout) content, err := f.createSecretKey(cmd, timeout, options)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -131,16 +133,30 @@ func (f *SecretFactory) keyValuesFromCommands(sources map[string]string, timeout
} }
// Run a command, return its output as the secret. // Run a command, return its output as the secret.
func (f *SecretFactory) createSecretKey(command string, timeout time.Duration) ([]byte, error) { func (f *SecretFactory) createSecretKey(command string, timeout time.Duration, options *types.GeneratorOptions) ([]byte, error) {
if !f.fSys.IsDir(f.wd) { if !f.fSys.IsDir(f.wd) {
f.wd = filepath.Dir(f.wd) f.wd = filepath.Dir(f.wd)
if !f.fSys.IsDir(f.wd) { if !f.fSys.IsDir(f.wd) {
return nil, errors.New("not a directory: " + f.wd) return nil, errors.New("not a directory: " + f.wd)
} }
} }
if options != nil && options.TimeoutSeconds != nil {
t := time.Duration(*options.TimeoutSeconds) * time.Second
if t > timeout {
timeout = t
}
}
var commands []string
if options == nil || len(options.Shell) == 0 {
commands = []string{"sh", "-c", command}
} else {
commands = append(options.Shell, command)
}
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, "sh", "-c", command) cmd := exec.CommandContext(ctx, commands[0], commands[1:]...)
cmd.Dir = f.wd cmd.Dir = f.wd
return cmd.Output() return cmd.Output()
} }