update envoy gloo (#1105)

* update envoy * changelog * fix gRPC plugin * update log line * dep ensure
solo-io · Sep 3, 2019 · 40e56f5 · 40e56f5
1 parent 3e2b187
commit 40e56f5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/changelog/v0.18.30/updaate-envoy-gloo.yaml b/changelog/v0.18.30/updaate-envoy-gloo.yaml
@@ -0,0 +1,5 @@
+changelog:
+- type: DEPENDENCY_BUMP
+  dependencyOwner: solo-io
+  dependencyRepo: envoy-gloo
+  dependencyTag: v0.1.13
diff --git a/projects/envoyinit/cmd/Dockerfile b/projects/envoyinit/cmd/Dockerfile
@@ -1,4 +1,4 @@
-FROM soloio/envoy-gloo:0.1.10
+FROM soloio/envoy-gloo:0.1.13
 
 COPY envoyinit-linux-amd64 /usr/local/bin/envoyinit
 

diff --git a/projects/gloo/pkg/plugins/grpc/plugin.go b/projects/gloo/pkg/plugins/grpc/plugin.go
@@ -177,7 +177,7 @@ func (p *plugin) ProcessRoute(params plugins.RouteParams, in *v1.Route, out *env
 
 		// add query matcher to out path. kombina for now
 		// TODO: support query for matching
-		outPath += `?{{ default(query_string), "")}}`
+		outPath += `?{{ default(query_string, "")}}`
 
 		// Add param extractors back
 		var extractors map[string]*transformapi.Extraction

diff --git a/projects/gloo/pkg/syncer/envoy_translator_syncer.go b/projects/gloo/pkg/syncer/envoy_translator_syncer.go
@@ -50,7 +50,7 @@ func (s *translatorSyncer) syncEnvoy(ctx context.Context, snap *v1.ApiSnapshot)
 	defer span.End()
 
 	s.latestSnap = snap
-	ctx = contextutils.WithLogger(ctx, "translatorSyncer")
+	ctx = contextutils.WithLogger(ctx, "envoyTranslatorSyncer")
 	logger := contextutils.LoggerFrom(ctx)
 	logger.Infof("begin sync %v (%v proxies, %v upstreams, %v endpoints, %v secrets, %v artifacts, )", snap.Hash(),
 		len(snap.Proxies), len(snap.Upstreams), len(snap.Endpoints), len(snap.Secrets), len(snap.Artifacts))