diff --git a/cmd/conformance/gcp/main.go b/cmd/conformance/gcp/main.go index 0b7cdb0a..eed8f27b 100644 --- a/cmd/conformance/gcp/main.go +++ b/cmd/conformance/gcp/main.go @@ -29,6 +29,8 @@ import ( tessera "github.com/transparency-dev/trillian-tessera" "github.com/transparency-dev/trillian-tessera/storage/gcp" "golang.org/x/mod/sumdb/note" + "golang.org/x/net/http2" + "golang.org/x/net/http2/h2c" "k8s.io/klog/v2" ) @@ -93,7 +95,13 @@ func main() { _, _ = w.Write([]byte(fmt.Sprintf("%d", idx))) }) - if err := http.ListenAndServe(*listen, http.DefaultServeMux); err != nil { + h2s := &http2.Server{} + h1s := &http.Server{ + Addr: *listen, + Handler: h2c.NewHandler(http.DefaultServeMux, h2s), + } + + if err := h1s.ListenAndServe(); err != nil { klog.Exitf("ListenAndServe: %v", err) } } diff --git a/deployment/modules/gcp/cloudbuild/main.tf b/deployment/modules/gcp/cloudbuild/main.tf index ec33e443..15abd00a 100644 --- a/deployment/modules/gcp/cloudbuild/main.tf +++ b/deployment/modules/gcp/cloudbuild/main.tf @@ -122,7 +122,7 @@ resource "google_cloudbuild_trigger" "docker" { id = "hammer" name = "golang" script = <