namespaces - provided namespaces should always show in namespace list (…

…#2686)

Signed-off-by: Wayne Witzel III <[email protected]>

changelogs/unreleased/2259-wwitzel3

@@ -0,0 +1 @@
+Fixed issue with --namespace-list not adding namespaces list.

internal/api/namespaces_manager.go

@@ -134,18 +134,9 @@ func NamespacesGenerator(_ context.Context, config NamespaceManagerConfig) ([]st
  names = []string{initialNamespace}
  }
 
- for _, namespace := range providedNamespaces {
- found := false
- for _, foundNamespace := range names {
- if namespace == foundNamespace {
- found = true
- break
- }
- }
- if !found && namespaceClient.HasNamespace(namespace) {
- names = append(names, namespace)
- }
- }
+ names = append(names, providedNamespaces...)
+ names = uniqueStringSlice(names)
+
  return names, nil
 }
 
@@ -158,3 +149,15 @@ func CreateNamespacesEvent(namespaces []string) oevent.Event {
  },
  }
 }
+
+func uniqueStringSlice(nsSlice []string) []string {
+ keys := make(map[string]bool)
+ list := []string{}
+ for _, entry := range nsSlice {
+ if _, value := keys[entry]; !value {
+ keys[entry] = true
+ list = append(list, entry)
+ }
+ }
+ return list
+}

pkg/dash/dash_test.go

@@ -213,7 +213,6 @@ func mockClusterClientReturningNamespace(controller *gomock.Controller, namespac
  nsClient.EXPECT().InitialNamespace().Return(namespace)
  nsClient.EXPECT().ProvidedNamespaces().Return([]string{namespace})
  nsClient.EXPECT().Names().AnyTimes()
- nsClient.EXPECT().HasNamespace(namespace).Return(true)
 
  dynamicClient := clusterFake.NewMockDynamicInterface(controller)