Skip to content

K
k3s
Unverified Commit d9149506 authored by Jordan Liggitt's avatar Jordan Liggitt
Browse files
Options

Ensure network policy conversion round trips nil from field

parent e3e2e24c
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
pkg/apis/extensions/v1beta1/conversion.go
View file @ d9149506
...@@ -338,10 +338,12 @@ func Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngress ...@@ -338,10 +338,12 @@ func Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngress
return err return err
} }
} }
out.From = make([]networking.NetworkPolicyPeer, len(in.From)) if in.From != nil {
for i := range in.From { out.From = make([]networking.NetworkPolicyPeer, len(in.From))
if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil { for i := range in.From {
return err if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
return err
}
} }
} }
return nil return nil
...@@ -354,10 +356,12 @@ func Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngress ...@@ -354,10 +356,12 @@ func Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngress
return err return err
} }
} }
out.From = make([]extensionsv1beta1.NetworkPolicyPeer, len(in.From)) if in.From != nil {
for i := range in.From { out.From = make([]extensionsv1beta1.NetworkPolicyPeer, len(in.From))
if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil { for i := range in.From {
return err if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
return err
}
} }
} }
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