github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35302 from intelsdi-x/portforwarding_image_changes 

Automatic merge from submit-queue

test-images: server address is now configurable

This commit perform changes discussed in #32128
Should be merged before #35301

cc: @pskrzyns
pull/6/head
Kubernetes Submit Queue 2016-10-25 13:24:07 -07:00 committed by GitHub
parent 6e68b477df 69a1b1dbbf
commit b5d604bcb0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/port-forward-tester/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 1.0 TAG = 1.1
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push

6
test/images/port-forward-tester/portforwardtester.go
View File

@ -48,8 +48,12 @@ func getEnvInt(name string) int {
} }
func main() { func main() {
bindAddress := os.Getenv("BIND_ADDRESS")
if bindAddress == "" {
bindAddress = "localhost"
}
bindPort := os.Getenv("BIND_PORT") bindPort := os.Getenv("BIND_PORT")
listener, err := net.Listen("tcp", fmt.Sprintf("localhost:%s", bindPort)) listener, err := net.Listen("tcp", fmt.Sprintf("%s:%s", bindAddress, bindPort))
if err != nil { if err != nil {
fmt.Printf("Error listening: %v\n", err) fmt.Printf("Error listening: %v\n", err)
os.Exit(1) os.Exit(1)