Skip to content

Add an en var to use the namespace declared in the kubeconfig context #5297

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add an en var to use the namespace declared in the kubeconfig context #5297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d61cdf
Add FLUX_SYSTEM_NAMESPACE_FROM_CONTEXT to inherit kubens context
jybp Apr 11, 2025
7ff2e1c
FLUX_SYSTEM_NAMESPACE takes priority
jybp Apr 11, 2025
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
16 changes: 15 additions & 1 deletion cmd/flux/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ func main() {

func configureDefaultNamespace() {
*kubeconfigArgs.Namespace = rootArgs.defaults.Namespace

// First the FLUX_SYSTEM_NAMESPACE environment variable
fromEnv := os.Getenv("FLUX_SYSTEM_NAMESPACE")
if fromEnv != "" {
// namespace must be a valid DNS label. Assess against validation
Expand All @@ -214,8 +216,20 @@ func configureDefaultNamespace() {
logger.Warningf(" ignoring invalid FLUX_SYSTEM_NAMESPACE: %q", fromEnv)
return
}

kubeconfigArgs.Namespace = &fromEnv
return
}

// If no environment variable, check if we should use the namespace from the current context
if os.Getenv("FLUX_SYSTEM_NAMESPACE_FROM_CONTEXT") == "true" {
// Get the current context's namespace from kubeconfig
config, err := kubeconfigArgs.ToRawKubeConfigLoader().RawConfig()
if err == nil {
if ctx, exists := config.Contexts[config.CurrentContext]; exists && ctx.Namespace != "" {
kubeconfigArgs.Namespace = &ctx.Namespace
return
}
}
}
}

Expand Down