diff --git a/images/echoheaders/Makefile b/images/echoheaders/Makefile index 373b935a20..6215d12c6b 100644 --- a/images/echoheaders/Makefile +++ b/images/echoheaders/Makefile @@ -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 diff --git a/images/echoheaders/README.md b/images/echoheaders/README.md index 74e3195aaa..624394e829 100644 --- a/images/echoheaders/README.md +++ b/images/echoheaders/README.md @@ -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. diff --git a/images/echoheaders/echo-app.yaml b/images/echoheaders/echo-app.yaml index 95e8baee23..5c10dc8909 100644 --- a/images/echoheaders/echo-app.yaml +++ b/images/echoheaders/echo-app.yaml @@ -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 diff --git a/images/echoheaders/nginx.conf b/images/echoheaders/nginx.conf index 7d2ed9ed49..814c6121d1 100644 --- a/images/echoheaders/nginx.conf +++ b/images/echoheaders/nginx.conf @@ -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;