From a00a71c85e6f46b0d9466dcd6139ae95d3772065 Mon Sep 17 00:00:00 2001 From: Zhimin Xiang Date: Wed, 6 Jun 2018 15:51:11 -0700 Subject: [PATCH 1/2] Inject sidecar in autoscaler --- pkg/controller/revision/ela_autoscaler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/revision/ela_autoscaler.go b/pkg/controller/revision/ela_autoscaler.go index 81e7ce93277b..e7cba1f4cbbf 100644 --- a/pkg/controller/revision/ela_autoscaler.go +++ b/pkg/controller/revision/ela_autoscaler.go @@ -45,7 +45,7 @@ func MakeElaAutoscalerDeployment(rev *v1alpha1.Revision, autoscalerImage string) } annotations := MakeElaResourceAnnotations(rev) - annotations[sidecarIstioInjectAnnotation] = "false" + annotations[sidecarIstioInjectAnnotation] = "true" replicas := int32(1) From 94d26f61df9c5800a721d548cc301d6997069d4a Mon Sep 17 00:00:00 2001 From: Zhimin Xiang Date: Wed, 6 Jun 2018 16:20:25 -0700 Subject: [PATCH 2/2] fix unit test --- pkg/controller/revision/revision_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/revision/revision_test.go b/pkg/controller/revision/revision_test.go index 38aa7cf63820..93c73556c91a 100644 --- a/pkg/controller/revision/revision_test.go +++ b/pkg/controller/revision/revision_test.go @@ -502,7 +502,7 @@ func TestCreateRevCreatesStuff(t *testing.T) { ) expectedAutoscalerPodSpecAnnotations := sumMaps( rev.Annotations, - map[string]string{"sidecar.istio.io/inject": "false"}, + map[string]string{"sidecar.istio.io/inject": "true"}, ) asDeployment, err := kubeClient.AppsV1().Deployments(AutoscalerNamespace).Get(expectedAutoscalerName, metav1.GetOptions{})