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

charts: Using downwardAPI to mount labels to the proxy container #4199

Merged
merged 50 commits into from
Apr 22, 2020
Merged

charts: Using downwardAPI to mount labels to the proxy container #4199

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
87f377c
use downward API to mount labels to the proxy container as a volume
Pothulapati Mar 25, 2020
62c4cce
Formatting fix
Pothulapati Mar 25, 2020
bbbe9dc
Fix formatting of templates
Pothulapati Mar 25, 2020
57887b5
update uninject code to remove the podinfo volume
Pothulapati Mar 25, 2020
fbaaf8c
update golden test files
Pothulapati Mar 25, 2020
f85bbd3
update controller inject files
Pothulapati Mar 25, 2020
e310587
Merge branch 'master' into downward-labels
Pothulapati Mar 25, 2020
4a2691a
update proxy injector code to add volumes by default
Pothulapati Mar 25, 2020
588e0a9
add a new labels env path
Pothulapati Mar 26, 2020
89e329e
update go test files
Pothulapati Mar 26, 2020
f42ee8f
Merge branch 'master' into downward-labels
Pothulapati Mar 31, 2020
681b66a
keep addrootvolume flag in helm chart
Pothulapati Mar 31, 2020
1c6325d
Merge branch 'master' into downward-labels
Pothulapati Apr 1, 2020
9f3446a
allow patch value setting even when identity is nil
Pothulapati Apr 2, 2020
838c3b9
update golden files for proxy injector
Pothulapati Apr 2, 2020
a6abfe6
update integration test golden files
Pothulapati Apr 2, 2020
1fd2788
Merge branch 'master' into downward-labels
Pothulapati Apr 9, 2020
368bd27
add namespace as a label to the pod
Pothulapati Apr 9, 2020
e7d8e50
update integration injectManual tests
Pothulapati Apr 9, 2020
eb88b02
fix spelling mistake
Pothulapati Apr 9, 2020
2efee71
update install manifests to only add when tracing is enabled
Pothulapati Apr 10, 2020
622e543
update code to also include smi-metrics
Pothulapati Apr 10, 2020
e292ec5
remove extra line in templating
Pothulapati Apr 10, 2020
c6f799b
refactor proxy inject template
Pothulapati Apr 10, 2020
02759a9
Merge branch 'master' into downward-labels
Pothulapati Apr 10, 2020
c36e2a3
update templating for inject
Pothulapati Apr 10, 2020
c9850c3
update controller inject tests
Pothulapati Apr 10, 2020
b059d44
add a trace inject test
Pothulapati Apr 10, 2020
ea83b14
remove volumes template from controlplane components
Pothulapati Apr 10, 2020
e401fc0
update inject integration tests
Pothulapati Apr 10, 2020
ef8db38
update test golden files
Pothulapati Apr 10, 2020
f051ebd
add verbose golden file
Pothulapati Apr 10, 2020
a07fc73
update integration test golden files
Pothulapati Apr 10, 2020
79facbf
update to a new env variable
Pothulapati Apr 10, 2020
92ea884
add downwardAPi for controlplaneTracing
Pothulapati Apr 14, 2020
9ad3381
update patch and render tests
Pothulapati Apr 14, 2020
ca14517
update tracing tempalte files
Pothulapati Apr 14, 2020
d0dff92
formatting fix in labels
Pothulapati Apr 14, 2020
9aaf74c
fix formatting in patch golden files
Pothulapati Apr 14, 2020
dbf5317
add controlPlaneTracing condition to volumeMounts
Pothulapati Apr 14, 2020
6023ac4
add workload-ns label for control-plane components
Pothulapati Apr 14, 2020
5594216
update add-ons to have workload-ns
Pothulapati Apr 14, 2020
f09b66e
Revert "add workload-ns label for control-plane components"
Pothulapati Apr 15, 2020
6d36844
add workload-ns label to control-plane components
Pothulapati Apr 15, 2020
91c790d
add podinfo volume to smi-metrics
Pothulapati Apr 15, 2020
345e098
Add more documentation on the approach
Pothulapati Apr 17, 2020
3f5c252
lower case comments and formatting
Pothulapati Apr 17, 2020
a96d441
add a caution comment at paritals/metadata.tpl
Pothulapati Apr 17, 2020
f56e3da
Merge branch 'master' into downward-labels
Pothulapati Apr 20, 2020
ea6651e
update new golden files
Pothulapati Apr 20, 2020
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
Prev Previous commit
Next Next commit
add controlPlaneTracing condition to volumeMounts 
Signed-off-by: Tarun Pothulapati <tarunpothulapati@outlook.com>
  • Loading branch information
@Pothulapati
Pothulapati committed Apr 14, 2020
commit dbf5317bf614f70016360187ae2352c7433bc4d9
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 @@ -121,7 +121,7 @@ lifecycle:
- -c
- sleep {{.Values.global.proxy.waitBeforeExitSeconds}}
{{- end }}
{{- if or (not .Values.global.proxy.disableIdentity) (.Values.global.proxy.saMountPath) (.Values.global.proxy.trace) }}
{{- if or (.Values.global.proxy.trace.collectorSvcAddr) (.Values.global.controlPlaneTracing) (not .Values.global.proxy.disableIdentity) (.Values.global.proxy.saMountPath) }}
volumeMounts:
{{- if or (.Values.global.proxy.trace.collectorSvcAddr) (.Values.global.controlPlaneTracing) }}
- mountPath: var/run/linkerd/podinfo
Expand Down
3 changes: 1 addition & 2 deletions controller/proxy-injector/fake/data/pod-with-debug.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,7 @@
"readOnlyRootFilesystem": true,
"runAsUser": 2102
},
"terminationMessagePolicy": "FallbackToLogsOnError",
"volumeMounts": null
"terminationMessagePolicy": "FallbackToLogsOnError"
}
}
]
3 changes: 1 addition & 2 deletions controller/proxy-injector/fake/data/pod.patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@
"readOnlyRootFilesystem": true,
"runAsUser": 2102
},
"terminationMessagePolicy": "FallbackToLogsOnError",
"volumeMounts": null
"terminationMessagePolicy": "FallbackToLogsOnError"
}
}
]