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

Jump to bottom

Set debug.verbose to "flow" as a default for all CI runs #18431

Merged
merged 3 commits into from Jan 12, 2022
Merged

Set debug.verbose to "flow" as a default for all CI runs #18431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c37c454
test/helpers: Tidy up default Helm options
christarazi Jan 10, 2022
45ff4d1
test: Default debug.verbose to "flow" for all CI runs
christarazi Jan 10, 2022
181b316
test/k8sT: Remove duplicated config inside Policies suite
christarazi Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 26 additions & 23 deletions test/helpers/kubectl.go
View file
Open in desktop
Expand Up @@ -81,35 +81,38 @@ var (
// below. These overrides represent a desire to set the default for all
// tests, instead of test-specific variations.
defaultHelmOptions = map[string]string{
"image.repository": "k8s1:5000/cilium/cilium-dev",
"image.tag": "latest",
"image.useDigest": "false",
"preflight.image.repository": "k8s1:5000/cilium/cilium-dev", // Set again in init to match agent.image!
"preflight.image.tag": "latest",
"preflight.image.useDigest": "false",
"operator.image.repository": "k8s1:5000/cilium/operator",
"operator.image.tag": "latest",
"operator.image.suffix": "",
"operator.image.useDigest": "false",
"image.repository": "k8s1:5000/cilium/cilium-dev",
"image.tag": "latest",
"image.useDigest": "false",
"preflight.image.repository": "k8s1:5000/cilium/cilium-dev", // Set again in init to match agent.image!
"preflight.image.tag": "latest",
"preflight.image.useDigest": "false",
"operator.image.repository": "k8s1:5000/cilium/operator",
"operator.image.tag": "latest",
"operator.image.suffix": "",
"operator.image.useDigest": "false",

// Enable embedded Hubble, both on unix socket and TCP port 4244.
"hubble.enabled": "true",
"hubble.listenAddress": ":4244",
"hubble.eventBufferCapacity": "65535",
"hubble.relay.image.repository": "k8s1:5000/cilium/hubble-relay",
"hubble.relay.image.tag": "latest",
"hubble.relay.image.useDigest": "false",
"hubble.eventBufferCapacity": "65535",
"debug.enabled": "true",
"k8s.requireIPv4PodCIDR": "true",
"pprof.enabled": "true",
"logSystemLoad": "true",
"bpf.preallocateMaps": "false",
"etcd.leaseTTL": "30s",
"ipv4.enabled": "true",
"ipv6.enabled": "true",

"debug.enabled": "true",
"debug.verbose": "flow",

"k8s.requireIPv4PodCIDR": "true",
"pprof.enabled": "true",
"logSystemLoad": "true",
"bpf.preallocateMaps": "false",
"etcd.leaseTTL": "30s",
"ipv4.enabled": "true",
"ipv6.enabled": "true",
// "extraEnv[0].name": "KUBE_CACHE_MUTATION_DETECTOR",
// "extraEnv[0].value": "true",

// Enable embedded Hubble, both on unix socket and TCP port 4244.
"hubble.enabled": "true",
"hubble.listenAddress": ":4244",

// We need CNP node status to know when a policy is being enforced
"enableCnpStatusUpdates": "true",
"ipv4NativeRoutingCIDR": IPv4NativeRoutingCIDR,
Expand Down
4 changes: 0 additions & 4 deletions test/k8sT/Policies.go
View file
Open in desktop
Expand Up @@ -104,8 +104,6 @@ var _ = SkipDescribeIf(func() bool {

daemonCfg = map[string]string{
"tls.secretsBackend": "k8s",
"debug.verbose": "flow",
"hubble.enabled": "true",
}
ciliumFilename = helpers.TimestampFilename("cilium.yaml")
DeployCiliumOptionsAndDNS(kubectl, ciliumFilename, daemonCfg)
Expand Down Expand Up @@ -2359,8 +2357,6 @@ var _ = SkipDescribeIf(helpers.DoesNotRunOn419OrLaterKernel,
kubectl = helpers.CreateKubectl(helpers.K8s1VMName(), logger)
daemonCfg = map[string]string{
"tls.secretsBackend": "k8s",
"debug.verbose": "flow",
"hubble.enabled": "true",
}
ciliumFilename = helpers.TimestampFilename("cilium.yaml")
})
Expand Down
2 changes: 1 addition & 1 deletion test/k8sT/assertionHelpers.go
View file
Open in desktop
Expand Up @@ -105,7 +105,7 @@ func ExpectCiliumPreFlightInstallReady(vm *helpers.Kubectl) {

// DeployCiliumAndDNS deploys DNS and cilium into the kubernetes cluster
func DeployCiliumAndDNS(vm *helpers.Kubectl, ciliumFilename string) {
DeployCiliumOptionsAndDNS(vm, ciliumFilename, map[string]string{"debug.verbose": "flow"})
DeployCiliumOptionsAndDNS(vm, ciliumFilename, map[string]string{})
}

func redeployCilium(vm *helpers.Kubectl, ciliumFilename string, options map[string]string) {
Expand Down