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

Always include operator namespace in cached k8s client namespaces #2566

Merged
merged 7 commits into from
Feb 14, 2020
Merged

Always include operator namespace in cached k8s client namespaces #2566

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b2d5be
Include operator namespace in list of k8s client namespaces
pebrc Feb 14, 2020
61a54a1
Allow k8s client access to operator namespace in namespaced manifest
pebrc Feb 14, 2020
d57bd12
Revert "Include operator namespace in list of k8s client namespaces"
pebrc Feb 14, 2020
06c0688
Revert "Allow k8s client access to operator namespace in namespaced m…
pebrc Feb 14, 2020
af7c738
Always include the operator namespace in the client cache
pebrc Feb 14, 2020
f637b24
Fix typo
pebrc Feb 14, 2020
c65d676
Merge remote-tracking branch 'upstream/master' into fix-license-e2e
pebrc Feb 14, 2020
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
13 changes: 7 additions & 6 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,16 @@ func execute() {

// configure the manager cache based on the number of managed namespaces
managedNamespaces := viper.GetStringSlice(operator.NamespacesFlag)
switch len(managedNamespaces) {
case 0:
switch {
case len(managedNamespaces) == 0:
log.Info("Operator configured to manage all namespaces")
case 1:
log.Info("Operator configured to manage a single namespace", "namespace", managedNamespaces[0])
case len(managedNamespaces) == 1 && managedNamespaces[0] == operatorNamespace:
log.Info("Operator configured to manage a single namespace", "namespace", managedNamespaces[0], "operator_namespace", operatorNamespace)
opts.Namespace = managedNamespaces[0]
default:
log.Info("Operator configured to manage multiple namespaces", "namespaces", managedNamespaces)
opts.NewCache = cache.MultiNamespacedCacheBuilder(managedNamespaces)
log.Info("Operator configured to manage multiple namespaces", "namespaces", managedNamespaces, "operator_namespace", operatorNamespace)
// always include the operator namespace into the manager cache so that we can work with operator-internal resources in there
opts.NewCache = cache.MultiNamespacedCacheBuilder(append(managedNamespaces, operatorNamespace))
}

// only expose prometheus metrics if provided a non-zero port
Expand Down