use my namespace as key namespace

Signed-off-by: Jan Jansen <[email protected]>

Author: farodin91

pkg/controller/controller_test.go

@@ -120,12 +120,13 @@ func TestConvert2SealedSecretPassThrough(t *testing.T) {
 
 func TestDefaultConfigDoesNotSkipRecreate(t *testing.T) {
 	ns := "some-namespace"
+	keyNs := "some-key-namespace"
 	var tweakopts func(*metav1.ListOptions)
-	clientset := fake.NewSimpleClientset()
+	clientset := fake.NewClientset()
 	ssc := ssfake.NewSimpleClientset()
 	keyRegistry := testKeyRegister(t, context.Background(), clientset, ns)
 
-	got, err := prepareController(clientset, ns, tweakopts, &Flags{SkipRecreate: false}, ssc, keyRegistry)
+	got, err := prepareController(clientset, ns, keyNs, tweakopts, &Flags{SkipRecreate: false}, ssc, keyRegistry)
 	if err != nil {
 		t.Fatalf("err %v want %v", got, nil)
 	}
@@ -139,12 +140,13 @@ func TestDefaultConfigDoesNotSkipRecreate(t *testing.T) {
 
 func TestSkipRecreateConfigDoesSkipIt(t *testing.T) {
 	ns := "some-namespace"
+	keyNs := "some-key-namespace"
 	var tweakopts func(*metav1.ListOptions)
-	clientset := fake.NewSimpleClientset()
+	clientset := fake.NewClientset()
 	ssc := ssfake.NewSimpleClientset()
 	keyRegistry := testKeyRegister(t, context.Background(), clientset, ns)
 
-	got, err := prepareController(clientset, ns, tweakopts, &Flags{SkipRecreate: true}, ssc, keyRegistry)
+	got, err := prepareController(clientset, ns, keyNs, tweakopts, &Flags{SkipRecreate: true}, ssc, keyRegistry)
 	if err != nil {
 		t.Fatalf("err %v want %v", got, nil)
 	}

pkg/controller/main.go

@@ -234,7 +234,7 @@ func Main(f *Flags, version string) error {
 		}
 	}
 
-	controller, err := prepareController(clientset, namespace, tweakopts, f, ssclientset, keyRegistry)
+	controller, err := prepareController(clientset, namespace, myNs, tweakopts, f, ssclientset, keyRegistry)
 	if err != nil {
 		return err
 	}
@@ -258,7 +258,7 @@ func Main(f *Flags, version string) error {
 				return err
 			}
 			if ns != namespace {
-				ctlr, err := prepareController(clientset, ns, tweakopts, f, ssclientset, keyRegistry)
+				ctlr, err := prepareController(clientset, ns, myNs, tweakopts, f, ssclientset, keyRegistry)
 				if err != nil {
 					return err
 				}
@@ -299,22 +299,23 @@ func Main(f *Flags, version string) error {
 func prepareController(
 	clientset kubernetes.Interface,
 	namespace string,
+	keyNamespace string,
 	tweakopts func(*metav1.ListOptions),
 	f *Flags,
 	ssclientset versioned.Interface,
 	keyRegistry *KeyRegistry,
 ) (*Controller, error) {
-	kinformer := initSecretInformerFactory(clientset, namespace, func(options *metav1.ListOptions) {
+	kinformer := initSecretInformerFactory(clientset, keyNamespace, func(options *metav1.ListOptions) {
 		options.LabelSelector = keySelector.String()
 	}, f.WatchForSecrets)
-	sinformer := initSecretInformerFactory(clientset, namespace, tweakopts, f.SkipRecreate)
+	sinformer := initSecretInformerFactory(clientset, namespace, tweakopts, !f.SkipRecreate)
 	ssinformer := ssinformers.NewFilteredSharedInformerFactory(ssclientset, 0, namespace, tweakopts)
 	controller, err := NewController(clientset, ssclientset, ssinformer, sinformer, kinformer, keyRegistry, f.MaxRetries, f.KeyOrderPriority)
 	return controller, err
 }
 
 func initSecretInformerFactory(clientset kubernetes.Interface, ns string, tweakopts func(*metav1.ListOptions), enabled bool) informers.SharedInformerFactory {
-	if enabled {
+	if !enabled {
 		return nil
 	}
 	return informers.NewSharedInformerFactoryWithOptions(clientset, 0, informers.WithNamespace(ns), informers.WithTweakListOptions(tweakopts))