github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 21:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5729 from thockin/plural_endpoints_30_restart

Browse Source 
Rename Service.ContainerPort to TargetPort in v1b3
This commit is contained in:
Dawn Chen
2015-03-20 14:37:46 -07:00
parent 0206115703 4375376e9c
commit 7a6490f572
28 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/v1beta2/conversion.go
View File

@@ -568,7 +568,7 @@ func init() {
}
out.CreateExternalLoadBalancer = in.Spec.CreateExternalLoadBalancer
out.PublicIPs = in.Spec.PublicIPs
out.ContainerPort = in.Spec.ContainerPort
out.ContainerPort = in.Spec.TargetPort
out.PortalIP = in.Spec.PortalIP
if err := s.Convert(&in.Spec.SessionAffinity, &out.SessionAffinity, 0); err != nil {
return err
@@ -594,7 +594,7 @@ func init() {
}
out.Spec.CreateExternalLoadBalancer = in.CreateExternalLoadBalancer
out.Spec.PublicIPs = in.PublicIPs
out.Spec.ContainerPort = in.ContainerPort
out.Spec.TargetPort = in.ContainerPort
out.Spec.PortalIP = in.PortalIP
if err := s.Convert(&in.SessionAffinity, &out.Spec.SessionAffinity, 0); err != nil {
return err