diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-11 15:44:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-11 15:44:55 +0000 |
| commit | 92bbae40de3c48ee6b4692ab9e4d7cc14db242bb (patch) | |
| tree | 89df1d0983bbb2c978e54e48d377f316e0b44485 /pkg/specgen/container_validate.go | |
| parent | 7af523ea5af8ba8ad61cd4b81a1494a42ac7b479 (diff) | |
| parent | 79e21b5b162d3c2d3fb274b20bfe180c15284893 (diff) | |
| download | podman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.tar.gz podman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.tar.bz2 podman-92bbae40de3c48ee6b4692ab9e4d7cc14db242bb.zip | |
Merge pull request #15248 from vrothberg/RUN-1606
kube play: sd-notify integration
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index 63d94b6b3..064245602 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -67,9 +67,9 @@ func (s *SpecGenerator) Validate() error { if len(s.ContainerBasicConfig.Systemd) > 0 && !util.StringInSlice(strings.ToLower(s.ContainerBasicConfig.Systemd), SystemDValues) { return fmt.Errorf("--systemd values must be one of %q: %w", strings.Join(SystemDValues, ", "), ErrInvalidSpecConfig) } - // sdnotify values must be container, conmon, or ignore - if len(s.ContainerBasicConfig.SdNotifyMode) > 0 && !util.StringInSlice(strings.ToLower(s.ContainerBasicConfig.SdNotifyMode), SdNotifyModeValues) { - return fmt.Errorf("--sdnotify values must be one of %q: %w", strings.Join(SdNotifyModeValues, ", "), ErrInvalidSpecConfig) + + if err := define.ValidateSdNotifyMode(s.ContainerBasicConfig.SdNotifyMode); err != nil { + return err } // |