diff options
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 1 | ||||
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 19a2b702c..04e24d625 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -425,7 +425,6 @@ func createContainerOptions(rt *libpod.Runtime, s *specgen.SpecGenerator, pod *l options = append(options, libpod.WithMaxLogSize(s.LogConfiguration.Size)) } if len(s.LogConfiguration.Options) > 0 && s.LogConfiguration.Options["tag"] != "" { - // Note: I'm really guessing here. options = append(options, libpod.WithLogTag(s.LogConfiguration.Options["tag"])) } diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 4c11e4bff..d56b50fd5 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -29,6 +29,7 @@ import ( "github.com/docker/go-units" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, podYAML *v1.PodTemplateSpec) (entities.PodCreateOptions, error) { @@ -153,6 +154,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener Driver: opts.LogDriver, } + s.LogConfiguration.Options = make(map[string]string) for _, o := range opts.LogOptions { split := strings.SplitN(o, "=", 2) if len(split) < 2 { @@ -170,7 +172,17 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener } s.LogConfiguration.Size = logSize default: - s.LogConfiguration.Options[split[0]] = split[1] + switch len(split[1]) { + case 0: + return nil, errors.Wrapf(define.ErrInvalidArg, "invalid log option") + default: + // tags for journald only + if s.LogConfiguration.Driver == "" || s.LogConfiguration.Driver == define.JournaldLogging { + s.LogConfiguration.Options[split[0]] = split[1] + } else { + logrus.Warnf("Can only set tags with journald log driver but driver is %q", s.LogConfiguration.Driver) + } + } } } |