diff --git a/pkg/metrics/gloo.go b/pkg/metrics/gloo.go index 0acd361e..67afd661 100644 --- a/pkg/metrics/gloo.go +++ b/pkg/metrics/gloo.go @@ -11,7 +11,7 @@ var glooQueries = map[string]string{ sum( rate( envoy_cluster_upstream_rq{ - envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", + envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-canary-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", envoy_response_code!~"5.*" }[{{ .Interval }}] ) @@ -20,7 +20,7 @@ var glooQueries = map[string]string{ sum( rate( envoy_cluster_upstream_rq{ - envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", + envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-canary-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", }[{{ .Interval }}] ) ) @@ -31,7 +31,7 @@ var glooQueries = map[string]string{ sum( rate( envoy_cluster_upstream_rq_time_bucket{ - envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", + envoy_cluster_name=~"{{ .Namespace }}-{{ .Name }}-canary-[0-9a-zA-Z-]+_[0-9a-zA-Z-]+", }[{{ .Interval }}] ) ) by (le) diff --git a/pkg/router/gloo.go b/pkg/router/gloo.go index 09bcd743..62303e20 100644 --- a/pkg/router/gloo.go +++ b/pkg/router/gloo.go @@ -181,5 +181,6 @@ func (gr *GlooRouter) writeUpstreamGroupRuleForCanary(canary *flaggerv1.Canary, if err != nil { return fmt.Errorf("UpstreamGroup %s.%s update failed: %v", targetName, canary.Namespace, err) } + gr.logger.With("canary", fmt.Sprintf("%s.%s", canary.Name, canary.Namespace)).Infof("UpstreamGroup %s updated", ug.Metadata.Name) return nil } diff --git a/test/e2e-gloo-tests.sh b/test/e2e-gloo-tests.sh index ab113633..8414427e 100755 --- a/test/e2e-gloo-tests.sh +++ b/test/e2e-gloo-tests.sh @@ -12,7 +12,7 @@ echo '>>> Creating test namespace' kubectl create namespace test echo ">>> Downloading Gloo CLI" -curl -SsL https://github.com/solo-io/gloo/releases/download/v0.13.27/glooctl-linux-amd64 > glooctl +curl -SsL https://github.com/solo-io/gloo/releases/download/v0.13.29/glooctl-linux-amd64 > glooctl chmod +x glooctl echo '>>> Installing load tester' diff --git a/test/e2e-gloo.sh b/test/e2e-gloo.sh index 5bdefef7..b4467b19 100755 --- a/test/e2e-gloo.sh +++ b/test/e2e-gloo.sh @@ -15,7 +15,7 @@ helm init --service-account tiller --upgrade --wait helm repo add gloo https://storage.googleapis.com/solo-public-helm echo '>>> Installing Gloo' -helm upgrade -i gloo gloo/gloo --version 0.13.27 \ +helm upgrade -i gloo gloo/gloo --version 0.13.29 \ --wait \ --namespace gloo-system \ --set gatewayProxies.gateway-proxy.service.type=NodePort