@@ -21,6 +21,7 @@ import (
2121 "time"
2222
2323 "k8s.io/apimachinery/pkg/api/meta"
24+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2425 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2526 "k8s.io/apimachinery/pkg/runtime"
2627 "k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,10 +32,12 @@ import (
3132// InformersMap create and caches Informers for (runtime.Object, schema.GroupVersionKind) pairs.
3233// It uses a standard parameter codec constructed based on the given generated Scheme.
3334type InformersMap struct {
34- // we abstract over the details of structured vs unstructured with the specificInformerMaps
35+ // we abstract over the details of structured/unstructured/metadata with the specificInformerMaps
36+ // TODO(directxman12): genericize this over different projections now that we have 3 different maps
3537
3638 structured * specificInformersMap
3739 unstructured * specificInformersMap
40+ metadata * specificInformersMap
3841
3942 // Scheme maps runtime.Objects to GroupVersionKinds
4043 Scheme * runtime.Scheme
@@ -47,58 +50,72 @@ func NewInformersMap(config *rest.Config,
4750 mapper meta.RESTMapper ,
4851 resync time.Duration ,
4952 namespace string ,
50- fieldSelectorByResource , labelSelectorByResource map [string ]string ) * InformersMap {
53+ fieldSelectorByResource , labelSelectorByResource map [schema. GroupResource ]string ) * InformersMap {
5154
5255 return & InformersMap {
5356 structured : newStructuredInformersMap (config , scheme , mapper , resync , namespace , fieldSelectorByResource , labelSelectorByResource ),
5457 unstructured : newUnstructuredInformersMap (config , scheme , mapper , resync , namespace , fieldSelectorByResource , labelSelectorByResource ),
58+ metadata : newMetadataInformersMap (config , scheme , mapper , resync , namespace , fieldSelectorByResource , labelSelectorByResource ),
5559
5660 Scheme : scheme ,
5761 }
5862}
5963
60- // Start calls Run on each of the informers and sets started to true. Blocks on the stop channel.
61- func (m * InformersMap ) Start (stop <- chan struct {}) error {
62- go m .structured .Start (stop )
63- go m .unstructured .Start (stop )
64- <- stop
64+ // Start calls Run on each of the informers and sets started to true. Blocks on the context.
65+ func (m * InformersMap ) Start (ctx context.Context ) error {
66+ go m .structured .Start (ctx )
67+ go m .unstructured .Start (ctx )
68+ go m .metadata .Start (ctx )
69+ <- ctx .Done ()
6570 return nil
6671}
6772
6873// WaitForCacheSync waits until all the caches have been started and synced.
69- func (m * InformersMap ) WaitForCacheSync (stop <- chan struct {} ) bool {
74+ func (m * InformersMap ) WaitForCacheSync (ctx context. Context ) bool {
7075 syncedFuncs := append ([]cache.InformerSynced (nil ), m .structured .HasSyncedFuncs ()... )
7176 syncedFuncs = append (syncedFuncs , m .unstructured .HasSyncedFuncs ()... )
77+ syncedFuncs = append (syncedFuncs , m .metadata .HasSyncedFuncs ()... )
7278
73- if ! m .structured .waitForStarted (stop ) {
79+ if ! m .structured .waitForStarted (ctx ) {
7480 return false
7581 }
76- if ! m .unstructured .waitForStarted (stop ) {
82+ if ! m .unstructured .waitForStarted (ctx ) {
7783 return false
7884 }
79- return cache .WaitForCacheSync (stop , syncedFuncs ... )
85+ if ! m .metadata .waitForStarted (ctx ) {
86+ return false
87+ }
88+ return cache .WaitForCacheSync (ctx .Done (), syncedFuncs ... )
8089}
8190
8291// Get will create a new Informer and add it to the map of InformersMap if none exists. Returns
8392// the Informer from the map.
8493func (m * InformersMap ) Get (ctx context.Context , gvk schema.GroupVersionKind , obj runtime.Object ) (bool , * MapEntry , error ) {
85- _ , isUnstructured := obj .(* unstructured.Unstructured )
86- _ , isUnstructuredList := obj .(* unstructured.UnstructuredList )
87- isUnstructured = isUnstructured || isUnstructuredList
88-
89- if isUnstructured {
94+ switch obj .(type ) {
95+ case * unstructured.Unstructured :
96+ return m .unstructured .Get (ctx , gvk , obj )
97+ case * unstructured.UnstructuredList :
9098 return m .unstructured .Get (ctx , gvk , obj )
99+ case * metav1.PartialObjectMetadata :
100+ return m .metadata .Get (ctx , gvk , obj )
101+ case * metav1.PartialObjectMetadataList :
102+ return m .metadata .Get (ctx , gvk , obj )
103+ default :
104+ return m .structured .Get (ctx , gvk , obj )
91105 }
92-
93- return m .structured .Get (ctx , gvk , obj )
94106}
95107
96108// newStructuredInformersMap creates a new InformersMap for structured objects.
97- func newStructuredInformersMap (config * rest.Config , scheme * runtime.Scheme , mapper meta.RESTMapper , resync time.Duration , namespace string , fieldSelectorByResource , labelSelectorByResource map [string ]string ) * specificInformersMap {
98- return newSpecificInformersMap (config , scheme , mapper , resync , namespace , fieldSelectorByResource , labelSelectorByResource , createStructuredListWatch )
109+ func newStructuredInformersMap (config * rest.Config , scheme * runtime.Scheme , mapper meta.RESTMapper , resync time.Duration , namespace string , fieldSelectorByResource , labelSelectorByResource map [schema. GroupResource ]string ) * specificInformersMap {
110+ return newSpecificInformersMap (config , scheme , mapper , resync , namespace , createStructuredListWatch , fieldSelectorByResource , labelSelectorByResource )
99111}
100112
101113// newUnstructuredInformersMap creates a new InformersMap for unstructured objects.
102- func newUnstructuredInformersMap (config * rest.Config , scheme * runtime.Scheme , mapper meta.RESTMapper , resync time.Duration , namespace string , fieldSelectorByResource , labelSelectorByResource map [string ]string ) * specificInformersMap {
103- return newSpecificInformersMap (config , scheme , mapper , resync , namespace , fieldSelectorByResource , labelSelectorByResource , createUnstructuredListWatch )
114+ func newUnstructuredInformersMap (config * rest.Config , scheme * runtime.Scheme , mapper meta.RESTMapper , resync time.Duration , namespace string , fieldSelectorByResource , labelSelectorByResource map [schema.GroupResource ]string ) * specificInformersMap {
115+ return newSpecificInformersMap (config , scheme , mapper , resync , namespace , createUnstructuredListWatch , fieldSelectorByResource , labelSelectorByResource )
116+ }
117+
118+ // newMetadataInformersMap creates a new InformersMap for metadata-only objects.
119+ func newMetadataInformersMap (config * rest.Config , scheme * runtime.Scheme , mapper meta.RESTMapper , resync time.Duration , namespace string , fieldSelectorByResource , labelSelectorByResource map [schema.GroupResource ]string ) * specificInformersMap {
120+ return newSpecificInformersMap (config , scheme , mapper , resync , namespace , createMetadataListWatch , fieldSelectorByResource , labelSelectorByResource )
104121}
0 commit comments