pkg/config: turn Annotations into attributedstring.Slice
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
parent
b8c3014c2a
commit
04569d2f52
|
|
@ -79,7 +79,7 @@ type ContainersConfig struct {
|
||||||
ApparmorProfile string `toml:"apparmor_profile,omitempty"`
|
ApparmorProfile string `toml:"apparmor_profile,omitempty"`
|
||||||
|
|
||||||
// Annotation to add to all containers
|
// Annotation to add to all containers
|
||||||
Annotations []string `toml:"annotations,omitempty"`
|
Annotations attributedstring.Slice `toml:"annotations,omitempty"`
|
||||||
|
|
||||||
// BaseHostsFile is the path to a hosts file, the entries from this file
|
// BaseHostsFile is the path to a hosts file, the entries from this file
|
||||||
// are added to the containers hosts file. As special value "image" is
|
// are added to the containers hosts file. As special value "image" is
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ func defaultConfig() (*Config, error) {
|
||||||
|
|
||||||
return &Config{
|
return &Config{
|
||||||
Containers: ContainersConfig{
|
Containers: ContainersConfig{
|
||||||
Annotations: []string{},
|
Annotations: attributedstring.Slice{},
|
||||||
ApparmorProfile: DefaultApparmorProfile,
|
ApparmorProfile: DefaultApparmorProfile,
|
||||||
BaseHostsFile: "",
|
BaseHostsFile: "",
|
||||||
CgroupNS: cgroupNS,
|
CgroupNS: cgroupNS,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue