From d587834df145847c2f70041df83448fcac7c7218 Mon Sep 17 00:00:00 2001 From: Chen Shou Date: Thu, 17 Sep 2020 20:47:03 +0000 Subject: [PATCH] Allow istio sidecar injection for all broker components --- pkg/reconciler/brokercell/brokercell.go | 2 ++ pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml | 2 +- .../brokercell/testingdata/fanout_deployment_with_status.yaml | 2 +- pkg/reconciler/brokercell/testingdata/retry_deployment.yaml | 2 +- .../brokercell/testingdata/retry_deployment_with_status.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/reconciler/brokercell/brokercell.go b/pkg/reconciler/brokercell/brokercell.go index 5d2661087a..f760cecfa4 100644 --- a/pkg/reconciler/brokercell/brokercell.go +++ b/pkg/reconciler/brokercell/brokercell.go @@ -264,6 +264,7 @@ func (r *Reconciler) makeFanoutArgs(bc *intv1alpha1.BrokerCell) resources.Fanout Image: r.env.FanoutImage, ServiceAccountName: r.env.ServiceAccountName, MetricsPort: r.env.MetricsPort, + AllowIstioSidecar: true, CPURequest: bc.Spec.Components.Fanout.CPURequest, CPULimit: bc.Spec.Components.Fanout.CPULimit, MemoryRequest: bc.Spec.Components.Fanout.MemoryRequest, @@ -291,6 +292,7 @@ func (r *Reconciler) makeRetryArgs(bc *intv1alpha1.BrokerCell) resources.RetryAr Image: r.env.RetryImage, ServiceAccountName: r.env.ServiceAccountName, MetricsPort: r.env.MetricsPort, + AllowIstioSidecar: true, CPURequest: bc.Spec.Components.Retry.CPURequest, CPULimit: bc.Spec.Components.Retry.CPULimit, MemoryRequest: bc.Spec.Components.Retry.MemoryRequest, diff --git a/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml b/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml index d1b0b57f0a..b2cf38b333 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml @@ -41,7 +41,7 @@ spec: metadata: labels: *labels annotations: - sidecar.istio.io/inject: "false" + sidecar.istio.io/inject: "true" spec: serviceAccountName: broker terminationGracePeriodSeconds: 60 diff --git a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml index 58661fef71..f04d97254c 100644 --- a/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml @@ -42,7 +42,7 @@ spec: metadata: labels: *labels annotations: - sidecar.istio.io/inject: "false" + sidecar.istio.io/inject: "true" spec: serviceAccountName: broker terminationGracePeriodSeconds: 60 diff --git a/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml b/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml index 4456e007d8..eff0401854 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_deployment.yaml @@ -41,7 +41,7 @@ spec: metadata: labels: *labels annotations: - sidecar.istio.io/inject: "false" + sidecar.istio.io/inject: "true" spec: serviceAccountName: broker terminationGracePeriodSeconds: 60 diff --git a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml index 0467979a01..b024c6e92b 100644 --- a/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml +++ b/pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml @@ -42,7 +42,7 @@ spec: metadata: labels: *labels annotations: - sidecar.istio.io/inject: "false" + sidecar.istio.io/inject: "true" spec: serviceAccountName: broker terminationGracePeriodSeconds: 60