sysdump: derive operator namespace from agent namespace if specified

Co-authored-by: Michi Mutsuzaki <[email protected]> Signed-off-by: Marcel Zieba <[email protected]>
cilium · Jun 27, 2024 · 92440dd · 92440dd
1 parent 9f4af5c
commit 92440dd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cli/sysdump.go b/cli/sysdump.go
@@ -34,8 +34,13 @@ func newCmdSysdump(hooks sysdump.Hooks) *cobra.Command {
 			if sysdumpOptions.CiliumNamespace == "" && cmd.Flags().Changed("namespace") {
 				sysdumpOptions.CiliumNamespace = namespace
 			}
-			if sysdumpOptions.CiliumOperatorNamespace == "" && cmd.Flags().Changed("namespace") {
-				sysdumpOptions.CiliumOperatorNamespace = namespace
+			if sysdumpOptions.CiliumOperatorNamespace == "" {
+				if cmd.Flags().Changed("namespace") {
+					sysdumpOptions.CiliumOperatorNamespace = namespace
+				} else {
+					// Assume the same namespace for operator as for agent if not specified
+					sysdumpOptions.CiliumOperatorNamespace = sysdumpOptions.CiliumNamespace
+				}
 			}
 			// Honor --helm-release-name global flag in case it is set and --cilium-helm-release-name is not set
 			if sysdumpOptions.CiliumHelmReleaseName == "" && cmd.Flags().Changed("helm-release-name") {