Skip to content

K
k3s
Commit 33fcef6b authored by Tim Hockin's avatar Tim Hockin
Browse files
Options

Convert DNSPolicy wrt ContainerManifest

parent ee2f63a8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/api/conversion.go
View file @ 33fcef6b
...@@ -32,6 +32,7 @@ func init() { ...@@ -32,6 +32,7 @@ func init() {
out.Spec.Containers = in.Containers out.Spec.Containers = in.Containers
out.Spec.Volumes = in.Volumes out.Spec.Volumes = in.Volumes
out.Spec.RestartPolicy = in.RestartPolicy out.Spec.RestartPolicy = in.RestartPolicy
out.Spec.DNSPolicy = in.DNSPolicy
out.Name = in.ID out.Name = in.ID
out.UID = in.UUID out.UID = in.UUID
// TODO(dchen1107): Move this conversion to pkg/api/v1beta[123]/conversion.go // TODO(dchen1107): Move this conversion to pkg/api/v1beta[123]/conversion.go
...@@ -48,6 +49,7 @@ func init() { ...@@ -48,6 +49,7 @@ func init() {
out.Containers = in.Spec.Containers out.Containers = in.Spec.Containers
out.Volumes = in.Spec.Volumes out.Volumes = in.Spec.Volumes
out.RestartPolicy = in.Spec.RestartPolicy out.RestartPolicy = in.Spec.RestartPolicy
out.DNSPolicy = in.Spec.DNSPolicy
out.Version = "v1beta2" out.Version = "v1beta2"
out.ID = in.Name out.ID = in.Name
out.UUID = in.UID out.UUID = in.UID
...@@ -104,6 +106,7 @@ func init() { ...@@ -104,6 +106,7 @@ func init() {
if err := s.Convert(&in.RestartPolicy, &out.RestartPolicy, 0); err != nil { if err := s.Convert(&in.RestartPolicy, &out.RestartPolicy, 0); err != nil {
return err return err
} }
out.DNSPolicy = in.DNSPolicy
out.Version = "v1beta2" out.Version = "v1beta2"
return nil return nil
}, },
...@@ -117,6 +120,7 @@ func init() { ...@@ -117,6 +120,7 @@ func init() {
if err := s.Convert(&in.RestartPolicy, &out.RestartPolicy, 0); err != nil { if err := s.Convert(&in.RestartPolicy, &out.RestartPolicy, 0); err != nil {
return err return err
} }
out.DNSPolicy = in.DNSPolicy
return nil return nil
}, },
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment