Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add native sidecar support #11465

Merged
merged 22 commits into from
Nov 22, 2023
Merged

Add native sidecar support #11465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
dcffd36
Add native sidecar support
teejaded Oct 6, 2023
2c1d8a1
Update viz/jaeger injectors to support native sidecars
teejaded Oct 10, 2023
945cd81
Update initContainer ordering for native sidecars
teejaded Oct 10, 2023
ccf447d
Only control initContainer order when doing native sidecars
teejaded Oct 18, 2023
8dd3eea
Add native sidecar startupProbe and preStop
teejaded Oct 18, 2023
9bf8f86
Reuse input file for native sidecar test
teejaded Oct 24, 2023
50fb0ee
Add cli doc for native sidecar
teejaded Oct 24, 2023
6cb451d
Fix control plane install with native sidecars
teejaded Oct 24, 2023
f082f51
Allow default authorizations to work with native sidecars
teejaded Oct 24, 2023
28b0aca
Allow native sidecars in controlplane without startupProbe
teejaded Nov 3, 2023
f6b2ddb
Cleanup additional unneeded testdata file
teejaded Nov 3, 2023
6e8f068
Remove native sidecar proxy preStop shutdown hook
teejaded Nov 3, 2023
6303ff3
Mimic await behavior with startupProbe
teejaded Nov 7, 2023
db2f92b
Override startupProbe parameters for destination and injector components
teejaded Nov 8, 2023
27b1328
Use empty string when proxypath is not found
teejaded Nov 10, 2023
2cda129
Remove unused file inject_emojivoto_deployment_native_sidecar.report.…
teejaded Nov 10, 2023
8e91ba2
Update helm docs
teejaded Nov 10, 2023
6d68d65
Disallow nativeSidecar and waitBeforeExitSeconds together
teejaded Nov 10, 2023
7b36117
Disable nativeSidecar for identity and increase startupProbeInitialDe…
teejaded Nov 10, 2023
fb3f58c
Add comment and rewrite, for readability, patch $initIndex
teejaded Nov 20, 2023
7cd3679
Add default proxy startupProbe parameters to values.yaml
teejaded Nov 20, 2023
62bcf87
Update `cli/cmd/doc.go` ProxyEnableNativeSidecarAnnotation description
teejaded Nov 20, 2023
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
6 changes: 5 additions & 1 deletion charts/linkerd-control-plane/templates/destination.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ spec:
*/}}
{{- $_ := set $tree.Values.proxy "defaultInboundPolicy" "all-unauthenticated" }}
{{- $_ := set $tree.Values.proxy "capabilities" (dict "drop" (list "ALL")) }}
{{- $_ := set $tree.Values.proxy "nativeSidecar" false }}
{{- if not $tree.Values.proxy.nativeSidecar }}
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{- end }}
- args:
- destination
- -addr=:8086
Expand Down Expand Up @@ -342,6 +343,9 @@ spec:
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" .Values.proxyInit.kubeAPIServerPorts -}}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
{{- if $tree.Values.proxy.nativeSidecar }}
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
{{- if .Values.priorityClassName -}}
priorityClassName: {{ .Values.priorityClassName }}
{{ end -}}
Expand Down
6 changes: 5 additions & 1 deletion charts/linkerd-control-plane/templates/identity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ spec:
{{- $_ := set $tree.Values.proxy "capabilities" (dict "drop" (list "ALL")) }}
{{- $_ := set $tree.Values.proxy "outboundDiscoveryCacheUnusedTimeout" "5s" }}
{{- $_ := set $tree.Values.proxy "inboundDiscoveryCacheUnusedTimeout" "90s" }}
{{- $_ := set $tree.Values.proxy "nativeSidecar" false }}
{{- if not $tree.Values.proxy.nativeSidecar }}
teejaded marked this conversation as resolved.
Show resolved Hide resolved
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{- end }}
teejaded marked this conversation as resolved.
Show resolved Hide resolved
initContainers:
{{ if .Values.cniEnabled -}}
- {{- include "partials.network-validator" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
Expand All @@ -229,6 +230,9 @@ spec:
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" .Values.proxyInit.kubeAPIServerPorts -}}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
{{- if $tree.Values.proxy.nativeSidecar }}
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
teejaded marked this conversation as resolved.
Show resolved Hide resolved
{{- if .Values.priorityClassName -}}
priorityClassName: {{ .Values.priorityClassName }}
{{ end -}}
Expand Down
6 changes: 5 additions & 1 deletion charts/linkerd-control-plane/templates/proxy-injector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ spec:
{{- $_ := set $tree.Values.proxy "capabilities" (dict "drop" (list "ALL")) }}
{{- $_ := set $tree.Values.proxy "outboundDiscoveryCacheUnusedTimeout" "5s" }}
{{- $_ := set $tree.Values.proxy "inboundDiscoveryCacheUnusedTimeout" "90s" }}
{{- $_ := set $tree.Values.proxy "nativeSidecar" false }}
{{- if not $tree.Values.proxy.nativeSidecar }}
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{- end }}
- args:
- proxy-injector
- -log-level={{.Values.controllerLogLevel}}
Expand Down Expand Up @@ -128,6 +129,9 @@ spec:
{{- $_ := set $tree.Values.proxyInit "ignoreOutboundPorts" .Values.proxyInit.kubeAPIServerPorts -}}
- {{- include "partials.proxy-init" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
{{- if $tree.Values.proxy.nativeSidecar }}
- {{- include "partials.proxy" $tree | indent 8 | trimPrefix (repeat 7 " ") }}
{{ end -}}
{{- if .Values.priorityClassName -}}
priorityClassName: {{ .Values.priorityClassName }}
{{ end -}}
Expand Down
2 changes: 1 addition & 1 deletion charts/partials/templates/_proxy.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ readinessProbe:
path: /ready
port: {{.Values.proxy.ports.admin}}
initialDelaySeconds: 2
{{- if .Values.proxy.nativeSidecar }}
{{- if and .Values.proxy.nativeSidecar (not .Values.proxy.component) }}
teejaded marked this conversation as resolved.
Show resolved Hide resolved
startupProbe:
httpGet:
path: /ready
Expand Down