Merge pull request #11059 from juanvallejo/jvallejo/add-nodeport-option

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oc

@@ -7406,6 +7406,8 @@ _oc_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")

contrib/completions/bash/openshift

@@ -11915,6 +11915,8 @@ _openshift_cli_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")
@@ -22845,6 +22847,8 @@ _openshift_kube_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")

contrib/completions/zsh/oc

@@ -7567,6 +7567,8 @@ _oc_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")

contrib/completions/zsh/openshift

@@ -12076,6 +12076,8 @@ _openshift_cli_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")
@@ -23006,6 +23008,8 @@ _openshift_kube_create_service_nodeport()
     local_nonpersistent_flags+=("--generator=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
+    flags+=("--node-port=")
+    local_nonpersistent_flags+=("--node-port=")
     flags+=("--output=")
     two_word_flags+=("-o")
     local_nonpersistent_flags+=("--output=")

docs/man/man1/oc-create-service-nodeport.1

@@ -29,6 +29,10 @@ Create a nodeport service with the specified name.
 \fB\-\-no\-headers\fP=false
     When using the default or custom\-column output format, don't print headers.
 
+.PP
+\fB\-\-node\-port\fP=0
+    Port used to expose the service on each node in a cluster.
+
 .PP
 \fB\-o\fP, \fB\-\-output\fP=""
     Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

docs/man/man1/openshift-cli-create-service-nodeport.1

@@ -29,6 +29,10 @@ Create a nodeport service with the specified name.
 \fB\-\-no\-headers\fP=false
     When using the default or custom\-column output format, don't print headers.
 
+.PP
+\fB\-\-node\-port\fP=0
+    Port used to expose the service on each node in a cluster.
+
 .PP
 \fB\-o\fP, \fB\-\-output\fP=""
     Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

docs/man/man1/openshift-kube-create-service-nodeport.1

@@ -29,6 +29,10 @@ Create a nodeport service with the specified name.
 \fB\-\-no\-headers\fP=false
     When using the default or custom\-column output format, don't print headers.
 
+.PP
+\fB\-\-node\-port\fP=0
+    Port used to expose the service on each node in a cluster.
+
 .PP
 \fB\-o\fP, \fB\-\-output\fP=""
     Output format. One of: json|yaml|wide|name|custom\-columns=...|custom\-columns\-file=...|go\-template=...|go\-template\-file=...|jsonpath=...|jsonpath\-file=... See custom columns [

test/cmd/services.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"
+trap os::test::junit::reconcile_output EXIT
+
+# Cleanup cluster resources created by this test
+(
+  set +e
+  oc delete all,templates --all
+  exit 0
+) &>/dev/null
+
+
+os::test::junit::declare_suite_start "cmd/create-service-nodeport"
+# This test validates the 'create service nodeport' command and its "--node-port" and "--tcp" options
+os::cmd::expect_success_and_text 'oc create service nodeport mynodeport --tcp=8080:7777 --node-port=30000' 'service "mynodeport" created'
+os::cmd::expect_failure_and_text 'oc create service nodeport mynodeport --tcp=8080:7777 --node-port=30000' 'provided port is already allocated'
+os::cmd::expect_failure_and_text 'oc create service nodeport mynodeport --tcp=8080:7777 --node-port=300' 'provided port is not in the valid range. The range of valid ports is 30000-32767'
+os::cmd::expect_success_and_text 'oc describe service mynodeport' 'NodePort\:.*30000'
+os::cmd::expect_success_and_text 'oc describe service mynodeport' 'NodePort\:.*8080-7777'
+
+echo "create-services-nodeport: ok"
+os::test::junit::declare_suite_end