diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-04-22 11:51:53 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-04-22 12:51:29 +0200 |
| commit | 2a8e435671186bead0e02b13f55e118724175cce (patch) | |
| tree | c5e39d30702560528d6a340ef1daf7b145be8534 /pkg/specgen/generate | |
| parent | 56d6ee0808d30c96289568724d748a0e85008638 (diff) | |
| download | podman-2a8e435671186bead0e02b13f55e118724175cce.tar.gz podman-2a8e435671186bead0e02b13f55e118724175cce.tar.bz2 podman-2a8e435671186bead0e02b13f55e118724175cce.zip | |
enable staticcheck linter
Fix many problems reported by the staticcheck linter, including many
real bugs!
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index df751a780..51f9fa535 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -82,7 +82,7 @@ func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, } // dns options if options := dnsConfig.Options; len(options) > 0 { - dnsOptions := make([]string, 0) + dnsOptions := make([]string, 0, len(options)) for _, opts := range options { d := opts.Name if opts.Value != nil { @@ -90,6 +90,7 @@ func ToPodOpt(ctx context.Context, podName string, p entities.PodCreateOptions, } dnsOptions = append(dnsOptions, d) } + p.Net.DNSOptions = dnsOptions } } return p, nil @@ -281,9 +282,6 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener annotations = opts.Annotations } if opts.PodInfraID != "" { - if annotations == nil { - - } annotations[ann.SandboxID] = opts.PodInfraID annotations[ann.ContainerType] = ann.ContainerTypeContainer } |