Skip to content

K
k3s
Commit cd5cb579 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #14837 from liggitt/nettest_tls

Auto commit by PR queue bot
parents 1b653ce1 1d1d7bb1
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 10 deletions
test/images/porter/Dockerfile
View file @ cd5cb579
...@@ -14,5 +14,7 @@ ...@@ -14,5 +14,7 @@
FROM scratch FROM scratch
MAINTAINER Daniel Smith <dbsmith@google.com> MAINTAINER Daniel Smith <dbsmith@google.com>
ADD localhost.crt localhost.crt
ADD localhost.key localhost.key
ADD porter porter ADD porter porter
ENTRYPOINT ["/porter"] ENTRYPOINT ["/porter"]
test/images/porter/Makefile
View file @ cd5cb579
...@@ -6,27 +6,24 @@ ...@@ -6,27 +6,24 @@
# `make push` will push the container-- you must supply a tag. # `make push` will push the container-- you must supply a tag.
REPO ?= gcr.io/google_containers REPO ?= gcr.io/google_containers
SUGGESTED_TAG = $(shell git rev-parse --verify HEAD)
porter: porter.go porter: porter.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./porter.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./porter.go
.tag: porter tag:
md5sum porter | cut -d " " -f 1 > .tag @echo "If all relevant changes are committed, suggest using TAG=$(SUGGESTED_TAG)"
@echo "$$ make container TAG=$(SUGGESTED_TAG)"
tag: .tag
@echo "Suggest using TAG=$(shell cat .tag)"
@echo "$$ make container TAG=$(shell cat .tag)"
@echo "or" @echo "or"
@echo "$$ make push TAG=$(shell cat .tag)" @echo "$$ make push TAG=$(SUGGESTED_TAG)"
container: container:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
docker build -t $(REPO)/porter:$(TAG) . docker build -t $(REPO)/porter:$(TAG) .
push: push:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
gcloud docker push $(REPO)/porter:$(TAG) gcloud docker push $(REPO)/porter:$(TAG)
clean: clean:
rm -f porter rm -f porter
rm -f .tag
test/images/porter/README.md
View file @ cd5cb579
This directory contains go source, Dockerfile and Makefile for making a test This directory contains go source, Dockerfile and Makefile for making a test
container which serves requested data on ports specified in ENV variables. container which serves requested data on ports specified in ENV variables.
The included localhost.crt is a PEM-encoded TLS cert with SAN IPs
"127.0.0.1" and "[::1]", expiring at the last second of 2049 (the end
of ASN.1 time), generated from src/crypto/tls:
go run generate_cert.go --rsa-bits 512 --host 127.0.0.1,::1,example.com --ca --start-date "Jan 1 00:00:00 1970" --duration=1000000h
To use a different cert/key, mount them into the pod and set the
CERT_FILE and KEY_FILE environment variables to the desired paths.
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/porter/README.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/porter/README.md?pixel)]()
test/images/porter/localhost.crt 0 → 100644
View file @ cd5cb579
-----BEGIN CERTIFICATE-----
MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwEjEQMA4GA1UEChMHQWNtZSBD
bzAeFw03MDAxMDEwMDAwMDBaFw00OTEyMzEyMzU5NTlaMBIxEDAOBgNVBAoTB0Fj
bWUgQ28wWjALBgkqhkiG9w0BAQEDSwAwSAJBAN55NcYKZeInyTuhcCwFMhDHCmwa
IUSdtXdcbItRB/yfXGBhiex00IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEA
AaNoMGYwDgYDVR0PAQH/BAQDAgCkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1Ud
EwEB/wQFMAMBAf8wLgYDVR0RBCcwJYILZXhhbXBsZS5jb22HBH8AAAGHEAAAAAAA
AAAAAAAAAAAAAAEwCwYJKoZIhvcNAQEFA0EAAoQn/ytgqpiLcZu9XKbCJsJcvkgk
Se6AbGXgSlq+ZCEVo0qIwSgeBqmsJxUu7NCSOwVJLYNEBO2DtIxoYVk+MA==
-----END CERTIFICATE-----
\ No newline at end of file
test/images/porter/localhost.key 0 → 100644
View file @ cd5cb579
-----BEGIN RSA PRIVATE KEY-----
MIIBPAIBAAJBAN55NcYKZeInyTuhcCwFMhDHCmwaIUSdtXdcbItRB/yfXGBhiex0
0IaLXQnSU+QZPRZWYqeTEbFSgihqi1PUDy8CAwEAAQJBAQdUx66rfh8sYsgfdcvV
NoafYpnEcB5s4m/vSVe6SU7dCK6eYec9f9wpT353ljhDUHq3EbmE4foNzJngh35d
AekCIQDhRQG5Li0Wj8TM4obOnnXUXf1jRv0UkzE9AHWLG5q3AwIhAPzSjpYUDjVW
MCUXgckTpKCuGwbJk7424Nb8bLzf3kllAiA5mUBgjfr/WtFSJdWcPQ4Zt9KTMNKD
EUO0ukpTwEIl6wIhAMbGqZK3zAAFdq8DD2jPx+UJXnh0rnOkZBzDtJ6/iN69AiEA
1Aq8MJgTaYsDQWyU/hDq5YkDJc9e9DSCvUIzqxQWMQE=
-----END RSA PRIVATE KEY-----
\ No newline at end of file
test/images/porter/pod.json
View file @ cd5cb579
...@@ -17,6 +17,22 @@ ...@@ -17,6 +17,22 @@
{ {
"name": "SERVE_PORT_81", "name": "SERVE_PORT_81",
"value": "<html><head></head><body><a href=\"/rewriteme\">rewritten link</a></body></html>" "value": "<html><head></head><body><a href=\"/rewriteme\">rewritten link</a></body></html>"
},
{
"name": "SERVE_TLS_PORT_443",
"value": "tls foo"
},
{
"name": "SERVE_TLS_PORT_444",
"value": "<html><head></head><body><a href=\"/tls-rewriteme\">tls rewritten link</a></body></html>"
},
{
"name": "CERT_FILE",
"value": "/localhost.crt"
},
{
"name": "KEY_FILE",
"value": "/localhost.key"
} }
], ],
"ports": [ "ports": [
...@@ -27,6 +43,14 @@ ...@@ -27,6 +43,14 @@
{ {
"name": "p81", "name": "p81",
"containerPort": 81 "containerPort": 81
},
{
"name": "p443",
"containerPort": 443
},
{
"name": "p444",
"containerPort": 444
} }
] ]
} }
......
test/images/porter/porter.go
View file @ cd5cb579
...@@ -30,6 +30,7 @@ import ( ...@@ -30,6 +30,7 @@ import (
) )
const prefix = "SERVE_PORT_" const prefix = "SERVE_PORT_"
const tlsPrefix = "SERVE_TLS_PORT_"
func main() { func main() {
for _, vk := range os.Environ() { for _, vk := range os.Environ() {
...@@ -43,6 +44,10 @@ func main() { ...@@ -43,6 +44,10 @@ func main() {
port := strings.TrimPrefix(key, prefix) port := strings.TrimPrefix(key, prefix)
go servePort(port, value) go servePort(port, value)
} }
if strings.HasPrefix(key, tlsPrefix) {
port := strings.TrimPrefix(key, tlsPrefix)
go serveTLSPort(port, value)
}
} }
select {} select {}
...@@ -57,3 +62,21 @@ func servePort(port, value string) { ...@@ -57,3 +62,21 @@ func servePort(port, value string) {
} }
log.Printf("server on port %q failed: %v", port, s.ListenAndServe()) log.Printf("server on port %q failed: %v", port, s.ListenAndServe())
} }
func serveTLSPort(port, value string) {
s := &http.Server{
Addr: "0.0.0.0:" + port,
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprint(w, value)
}),
}
certFile := os.Getenv("CERT_FILE")
if len(certFile) == 0 {
certFile = "localhost.crt"
}
keyFile := os.Getenv("KEY_FILE")
if len(keyFile) == 0 {
keyFile = "localhost.key"
}
log.Printf("tls server on port %q with certFile=%q, keyFile=%q failed: %v", port, certFile, keyFile, s.ListenAndServeTLS(certFile, keyFile))
}
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