DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ingress godeps

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-08-10 14:53:55 -04:00
parent d43021b3f1
commit 28db8fb16d
1068 changed files with 461467 additions and 117300 deletions
Download patch file Download diff file Expand all files Collapse all files

16
vendor/k8s.io/kubernetes/pkg/kubectl/service.go generated vendored
View file

@ -72,6 +72,7 @@ func paramNames() []GeneratorParam {
{"target-port", false},
{"port-name", false},
{"session-affinity", false},
{"cluster-ip", false},
}
}
@ -180,11 +181,11 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
Ports: ports,
},
}
targetPortString, found := params["target-port"]
if !found {
targetPortString, found = params["container-port"]
targetPortString := params["target-port"]
if len(targetPortString) == 0 {
targetPortString = params["container-port"]
}
if found && len(targetPortString) > 0 {
if len(targetPortString) > 0 {
var targetPort intstr.IntOrString
if portNum, err := strconv.Atoi(targetPortString); err != nil {
targetPort = intstr.FromString(targetPortString)
@ -225,5 +226,12 @@ func generate(genericParams map[string]interface{}) (runtime.Object, error) {
return nil, fmt.Errorf("unknown session affinity: %s", params["session-affinity"])
}
}
if len(params["cluster-ip"]) != 0 {
if params["cluster-ip"] == "None" {
service.Spec.ClusterIP = api.ClusterIPNone
} else {
service.Spec.ClusterIP = params["cluster-ip"]
}
}
return &service, nil
}