diff options
Diffstat (limited to 'cmd/kpod/create_cli.go')
| -rw-r--r-- | cmd/kpod/create_cli.go | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/cmd/kpod/create_cli.go b/cmd/kpod/create_cli.go index eaad46591..91e984785 100644 --- a/cmd/kpod/create_cli.go +++ b/cmd/kpod/create_cli.go @@ -7,44 +7,14 @@ import ( ) func getAllLabels(labelFile, inputLabels []string) (map[string]string, error) { - var labelValues []string labels := make(map[string]string) - labelValues, labelErr := readKVStrings(labelFile, inputLabels) + labelErr := readKVStrings(labels, labelFile, inputLabels) if labelErr != nil { return labels, errors.Wrapf(labelErr, "unable to process labels from --label and label-file") } - // Process KEY=VALUE stringslice in string map for WithLabels func - if len(labelValues) > 0 { - for _, i := range labelValues { - spliti := strings.Split(i, "=") - if len(spliti) < 2 { - return labels, errors.Errorf("labels must be in KEY=VALUE format: %s is invalid", i) - } - labels[spliti[0]] = spliti[1] - } - } return labels, nil } -func getAllEnvironmentVariables(envFiles, envInput []string) ([]string, error) { - env, err := readKVStrings(envFiles, envInput) - if err != nil { - return []string{}, errors.Wrapf(err, "unable to process variables from --env and --env-file") - } - // Add default environment variables if nothing defined - if len(env) == 0 { - env = append(env, defaultEnvVariables...) - } - // Each environment variable must be in the K=V format - for _, i := range env { - spliti := strings.Split(i, "=") - if len(spliti) != 2 { - return env, errors.Errorf("environment variables must be in the format KEY=VALUE: %s is invalid", i) - } - } - return env, nil -} - func convertStringSliceToMap(strSlice []string, delimiter string) (map[string]string, error) { sysctl := make(map[string]string) for _, inputSysctl := range strSlice { |