Skip to content

Commit

Permalink
Merge pull request #2242 from agau4779/http2
Browse files Browse the repository at this point in the history
add http/2
  • Loading branch information
k8s-ci-robot authored Mar 22, 2018
2 parents 39cb880 + 84a6e0c commit 935a5ef
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion images/echoheaders/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

TAG ?= 1.9
TAG ?= 1.10
REGISTRY ?= gcr.io/google_containers
ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm ppc64le
Expand Down
1 change: 1 addition & 0 deletions images/echoheaders/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

This is a simple server that responds with the http headers it received.

Image Versions >= 1.10 support HTTP2 on :8443.
Image Versions >= 1.9 expose HTTPS endpoint on :8443.
Image versions >= 1.4 removes the redirect introduced in 1.3.
Image versions >= 1.3 redirect requests on :80 with `X-Forwarded-Proto: http` to :443.
Expand Down
2 changes: 1 addition & 1 deletion images/echoheaders/echo-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: echoheaders
image: gcr.io/google_containers/echoserver:1.9
image: gcr.io/google_containers/echoserver:1.10
ports:
- containerPort: 8080
- containerPort: 8443
Expand Down
2 changes: 1 addition & 1 deletion images/echoheaders/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Request Body:
# basically instructs to create an individual listening socket for each worker process (using the SO_REUSEPORT
# socket option), allowing a kernel to distribute incoming connections between worker processes.
listen 8080 default_server reuseport;
listen 8443 default_server ssl reuseport;
listen 8443 default_server ssl http2 reuseport;

ssl_certificate /certs/certificate.crt;
ssl_certificate_key /certs/privateKey.key;
Expand Down

0 comments on commit 935a5ef

Please sign in to comment.