Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-03-19 17:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2844 from fluxcd/fix-logs-multiple-containers

Browse Source 
logs: select manager container when multiple exist
This commit is contained in:
Hidde Beydals
2022-06-23 14:14:58 +02:00
committed by GitHub
parent 874b05c5da d12e697769
commit 769e20423d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/flux/logs.go
View File

@@ -80,6 +80,8 @@ var logsArgs = &logsFlags{
tail: -1, tail: -1,
} }
const controllerContainer = "manager"
func init() { func init() {
logsCmd.Flags().Var(&logsArgs.logLevel, "level", logsArgs.logLevel.Description()) logsCmd.Flags().Var(&logsArgs.logLevel, "level", logsArgs.logLevel.Description())
logsCmd.Flags().StringVarP(&logsArgs.kind, "kind", "", logsArgs.kind, "displays errors of a particular toolkit kind e.g GitRepository") logsCmd.Flags().StringVarP(&logsArgs.kind, "kind", "", logsArgs.kind, "displays errors of a particular toolkit kind e.g GitRepository")
@@ -146,6 +148,10 @@ func logsCmdRun(cmd *cobra.Command, args []string) error {
var requests []rest.ResponseWrapper var requests []rest.ResponseWrapper
for _, pod := range pods { for _, pod := range pods {
logOpts := logOpts.DeepCopy()
if len(pod.Spec.Containers) > 1 {
logOpts.Container = controllerContainer
}
req := clientset.CoreV1().Pods(logsArgs.fluxNamespace).GetLogs(pod.Name, logOpts) req := clientset.CoreV1().Pods(logsArgs.fluxNamespace).GetLogs(pod.Name, logOpts)
requests = append(requests, req) requests = append(requests, req)
} }