Commit b543e612 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub

Merge pull request #26554 from kargakis/fix-expose-container-port

Automatic merge from submit-queue kubectl: make --container-port actually work for expose Even if it was recently deprecated, it should work as expected. @kubernetes/kubectl
parents d90cc907 476208de
...@@ -180,11 +180,11 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) { ...@@ -180,11 +180,11 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
Ports: ports, Ports: ports,
}, },
} }
targetPortString, found := params["target-port"] targetPortString := params["target-port"]
if !found { if len(targetPortString) == 0 {
targetPortString, found = params["container-port"] targetPortString = params["container-port"]
} }
if found && len(targetPortString) > 0 { if len(targetPortString) > 0 {
var targetPort intstr.IntOrString var targetPort intstr.IntOrString
if portNum, err := strconv.Atoi(targetPortString); err != nil { if portNum, err := strconv.Atoi(targetPortString); err != nil {
targetPort = intstr.FromString(targetPortString) targetPort = intstr.FromString(targetPortString)
......
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