diff --git a/injection/clients/namespacedkube/informers/core/v1/configmap/configmap.go b/injection/clients/namespacedkube/informers/core/v1/configmap/configmap.go index 9d9581df23..fd724cad37 100644 --- a/injection/clients/namespacedkube/informers/core/v1/configmap/configmap.go +++ b/injection/clients/namespacedkube/informers/core/v1/configmap/configmap.go @@ -19,14 +19,7 @@ package configmap import ( "context" - apicorev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" v1 "k8s.io/client-go/informers/core/v1" - kubernetes "k8s.io/client-go/kubernetes" - corev1 "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/tools/cache" - "knative.dev/pkg/client/injection/kube/client" "knative.dev/pkg/controller" "knative.dev/pkg/injection" "knative.dev/pkg/injection/clients/namespacedkube/informers/factory" @@ -35,7 +28,6 @@ import ( func init() { injection.Default.RegisterInformer(withInformer) - injection.Dynamic.RegisterDynamicInformer(withDynamicInformer) } // Key is used for associating the Informer inside the context.Context. @@ -47,11 +39,6 @@ func withInformer(ctx context.Context) (context.Context, controller.Informer) { return context.WithValue(ctx, Key{}, inf), inf.Informer() } -func withDynamicInformer(ctx context.Context) context.Context { - inf := &wrapper{client: client.Get(ctx)} - return context.WithValue(ctx, Key{}, inf) -} - // Get extracts the typed informer from the context. func Get(ctx context.Context) v1.ConfigMapInformer { untyped := ctx.Value(Key{}) @@ -61,44 +48,3 @@ func Get(ctx context.Context) v1.ConfigMapInformer { } return untyped.(v1.ConfigMapInformer) } - -type wrapper struct { - client kubernetes.Interface - - namespace string -} - -var _ v1.ConfigMapInformer = (*wrapper)(nil) -var _ corev1.ConfigMapLister = (*wrapper)(nil) - -func (w *wrapper) Informer() cache.SharedIndexInformer { - return cache.NewSharedIndexInformer(nil, &apicorev1.ConfigMap{}, 0, nil) -} - -func (w *wrapper) Lister() corev1.ConfigMapLister { - return w -} - -func (w *wrapper) ConfigMaps(namespace string) corev1.ConfigMapNamespaceLister { - return &wrapper{client: w.client, namespace: namespace} -} - -func (w *wrapper) List(selector labels.Selector) (ret []*apicorev1.ConfigMap, err error) { - lo, err := w.client.CoreV1().ConfigMaps(w.namespace).List(context.TODO(), metav1.ListOptions{ - LabelSelector: selector.String(), - // TODO(mattmoor): Incorporate resourceVersion bounds based on staleness criteria. - }) - if err != nil { - return nil, err - } - for idx := range lo.Items { - ret = append(ret, &lo.Items[idx]) - } - return ret, nil -} - -func (w *wrapper) Get(name string) (*apicorev1.ConfigMap, error) { - return w.client.CoreV1().ConfigMaps(w.namespace).Get(context.TODO(), name, metav1.GetOptions{ - // TODO(mattmoor): Incorporate resourceVersion bounds based on staleness criteria. - }) -} diff --git a/injection/clients/namespacedkube/informers/core/v1/secret/secret.go b/injection/clients/namespacedkube/informers/core/v1/secret/secret.go index e5193c8655..90d70627f4 100644 --- a/injection/clients/namespacedkube/informers/core/v1/secret/secret.go +++ b/injection/clients/namespacedkube/informers/core/v1/secret/secret.go @@ -19,14 +19,7 @@ package secret import ( context "context" - apicorev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" v1 "k8s.io/client-go/informers/core/v1" - kubernetes "k8s.io/client-go/kubernetes" - corev1 "k8s.io/client-go/listers/core/v1" - cache "k8s.io/client-go/tools/cache" - client "knative.dev/pkg/client/injection/kube/client" controller "knative.dev/pkg/controller" injection "knative.dev/pkg/injection" factory "knative.dev/pkg/injection/clients/namespacedkube/informers/factory" @@ -35,7 +28,6 @@ import ( func init() { injection.Default.RegisterInformer(withInformer) - injection.Dynamic.RegisterDynamicInformer(withDynamicInformer) } // Key is used for associating the Informer inside the context.Context. @@ -47,11 +39,6 @@ func withInformer(ctx context.Context) (context.Context, controller.Informer) { return context.WithValue(ctx, Key{}, inf), inf.Informer() } -func withDynamicInformer(ctx context.Context) context.Context { - inf := &wrapper{client: client.Get(ctx)} - return context.WithValue(ctx, Key{}, inf) -} - // Get extracts the typed informer from the context. func Get(ctx context.Context) v1.SecretInformer { untyped := ctx.Value(Key{}) @@ -61,44 +48,3 @@ func Get(ctx context.Context) v1.SecretInformer { } return untyped.(v1.SecretInformer) } - -type wrapper struct { - client kubernetes.Interface - - namespace string -} - -var _ v1.SecretInformer = (*wrapper)(nil) -var _ corev1.SecretLister = (*wrapper)(nil) - -func (w *wrapper) Informer() cache.SharedIndexInformer { - return cache.NewSharedIndexInformer(nil, &apicorev1.Secret{}, 0, nil) -} - -func (w *wrapper) Lister() corev1.SecretLister { - return w -} - -func (w *wrapper) Secrets(namespace string) corev1.SecretNamespaceLister { - return &wrapper{client: w.client, namespace: namespace} -} - -func (w *wrapper) List(selector labels.Selector) (ret []*apicorev1.Secret, err error) { - lo, err := w.client.CoreV1().Secrets(w.namespace).List(context.TODO(), metav1.ListOptions{ - LabelSelector: selector.String(), - // TODO(mattmoor): Incorporate resourceVersion bounds based on staleness criteria. - }) - if err != nil { - return nil, err - } - for idx := range lo.Items { - ret = append(ret, &lo.Items[idx]) - } - return ret, nil -} - -func (w *wrapper) Get(name string) (*apicorev1.Secret, error) { - return w.client.CoreV1().Secrets(w.namespace).Get(context.TODO(), name, metav1.GetOptions{ - // TODO(mattmoor): Incorporate resourceVersion bounds based on staleness criteria. - }) -}