Skip to content

added logs for calico #1250

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

added logs for calico #1250

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bfe7c4
added logs for calico
Mixaster995 Dec 27, 2021
d8bd875
f
Mixaster995 Dec 29, 2021
4737f71
f
Mixaster995 Dec 29, 2021
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: 3 additions & 3 deletions extensions/logs/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"os/signal"
"path/filepath"
"regexp"
"strings"
"sync"
"syscall"
"time"
Expand Down Expand Up @@ -61,7 +60,7 @@ type Config struct {
ArtifactsDir string `default:"logs" desc:"Directory for storing container logs" envconfig:"ARTIFACTS_DIR"`
Timeout time.Duration `default:"5s" desc:"Context timeout for kubernetes queries" split_words:"true"`
WorkerCount int `default:"8" desc:"Number of log collector workers" split_words:"true"`
AllowedNamespaces string `default:"(ns-.*)|(nsm-system)" desc:"Regex of allowed namespaces" split_words:"true"`
AllowedNamespaces string `default:"(^ns-.*)|(nsm-system)|spire|calico-vpp-dataplane" desc:"Regex of allowed namespaces" split_words:"true"`
Copy link
Member

@denis-tingaikin denis-tingaikin Dec 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calico is not a default value for the env.

Suggested change
AllowedNamespaces string `default:"(^ns-.*)|(nsm-system)|spire|calico-vpp-dataplane" desc:"Regex of allowed namespaces" split_words:"true"`
AllowedNamespaces string `default:"(^ns-.*)|(nsm-system)|(spire)" desc:"Regex of allowed namespaces" split_words:"true"`

}

func savePodLogs(ctx context.Context, pod *corev1.Pod, opts *corev1.PodLogOptions, fromInitContainers bool, dir string) {
Expand Down Expand Up @@ -109,6 +108,7 @@ func captureLogs(from time.Time, dir string) {
resp, err := kubeClient.CoreV1().Pods(fromAllNamespaces).List(operationCtx, metav1.ListOptions{})
if err != nil {
logrus.Errorf("An error while retrieving list of pods: %v", err.Error())
return
}
var wg sync.WaitGroup

Expand Down Expand Up @@ -232,7 +232,7 @@ func filterNamespaces(nsList *corev1.NamespaceList) []string {
var rv []string

for i := 0; i < len(nsList.Items); i++ {
if (nsList.Items[i].Name == "spire" || nsList.Items[i].Name == "nsm-system" || strings.HasPrefix(nsList.Items[i].Name, "ns-")) && nsList.Items[i].Status.Phase == corev1.NamespaceActive {
if matchRegex.MatchString(nsList.Items[i].Name) && nsList.Items[i].Status.Phase == corev1.NamespaceActive {
rv = append(rv, nsList.Items[i].Name)
}
}
Expand Down