Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

Allow istio sidecar injection for all broker components #1736

Merged
merged 1 commit into from
Sep 17, 2020
Merged

Allow istio sidecar injection for all broker components #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/reconciler/brokercell/brokercell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/brokercell/testingdata/fanout_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
metadata:
labels: *labels
annotations:
sidecar.istio.io/inject: "false"
sidecar.istio.io/inject: "true"
spec:
serviceAccountName: broker
terminationGracePeriodSeconds: 60
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/brokercell/testingdata/fanout_deployment_with_status.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
metadata:
labels: *labels
annotations:
sidecar.istio.io/inject: "false"
sidecar.istio.io/inject: "true"
spec:
serviceAccountName: broker
terminationGracePeriodSeconds: 60
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/brokercell/testingdata/retry_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
metadata:
labels: *labels
annotations:
sidecar.istio.io/inject: "false"
sidecar.istio.io/inject: "true"
spec:
serviceAccountName: broker
terminationGracePeriodSeconds: 60
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/brokercell/testingdata/retry_deployment_with_status.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
metadata:
labels: *labels
annotations:
sidecar.istio.io/inject: "false"
sidecar.istio.io/inject: "true"
spec:
serviceAccountName: broker
terminationGracePeriodSeconds: 60
Expand Down