@@ -28,48 +28,53 @@ var (
2828 // ErrCARMConfigMapNotFound is an error that is returned when the CARM
2929 // configmap is not found.
3030 ErrCARMConfigMapNotFound = errors .New ("CARM configmap not found" )
31- // ErrAccountIDNotFound is an error that is returned when the account ID
31+ // ErrKeyNotFound is an error that is returned when the account ID
3232 // is not found in the CARM configmap.
33- ErrAccountIDNotFound = errors .New ("account ID not found in CARM configmap" )
34- // ErrEmptyRoleARN is an error that is returned when the role ARN is empty
33+ ErrKeyNotFound = errors .New ("key not found in CARM configmap" )
34+ // ErrEmptyValue is an error that is returned when the role ARN is empty
3535 // in the CARM configmap.
36- ErrEmptyRoleARN = errors .New ("role ARN is empty in CARM configmap" )
36+ ErrEmptyValue = errors .New ("role value is empty in CARM configmap" )
3737)
3838
3939const (
4040 // ACKRoleAccountMap is the name of the configmap map object storing
4141 // all the AWS Account IDs associated with their AWS Role ARNs.
4242 ACKRoleAccountMap = "ack-role-account-map"
43+
44+ // ACKCARMMapV2 is the name of the v2 CARM map.
45+ // It stores the mapping for:
46+ // - Account ID to the AWS role ARNs.
47+ ACKCARMMapV2 = "ack-carm-map"
4348)
4449
45- // AccountCache is responsible for caching the CARM configmap
50+ // CARMMap is responsible for caching the CARM configmap
4651// data. It is listening to all the events related to the CARM map and
4752// make the changes accordingly.
48- type AccountCache struct {
53+ type CARMMap struct {
4954 sync.RWMutex
5055 log logr.Logger
51- roleARNs map [string ]string
56+ data map [string ]string
5257 configMapCreated bool
5358}
5459
55- // NewAccountCache instanciate a new AccountCache .
56- func NewAccountCache (log logr.Logger ) * AccountCache {
57- return & AccountCache {
60+ // NewCARMMapCache instanciate a new CARMMap .
61+ func NewCARMMapCache (log logr.Logger ) * CARMMap {
62+ return & CARMMap {
5863 log : log .WithName ("cache.account" ),
59- roleARNs : make (map [string ]string ),
64+ data : make (map [string ]string ),
6065 configMapCreated : false ,
6166 }
6267}
6368
64- // resourceMatchACKRoleAccountConfigMap verifies if a resource is
69+ // resourceMatchCARMConfigMap verifies if a resource is
6570// the CARM configmap. It verifies the name, namespace and object type.
66- func resourceMatchACKRoleAccountsConfigMap (raw interface {}) bool {
71+ func resourceMatchCARMConfigMap (raw interface {}, name string ) bool {
6772 object , ok := raw .(* corev1.ConfigMap )
68- return ok && object .ObjectMeta .Name == ACKRoleAccountMap
73+ return ok && object .ObjectMeta .Name == name
6974}
7075
7176// Run instantiate a new SharedInformer for ConfigMaps and runs it to begin processing items.
72- func (c * AccountCache ) Run (clientSet kubernetes.Interface , stopCh <- chan struct {}) {
77+ func (c * CARMMap ) Run (name string , clientSet kubernetes.Interface , stopCh <- chan struct {}) {
7378 c .log .V (1 ).Info ("Starting shared informer for accounts cache" , "targetConfigMap" , ACKRoleAccountMap )
7479 informer := informersv1 .NewConfigMapInformer (
7580 clientSet ,
@@ -79,67 +84,67 @@ func (c *AccountCache) Run(clientSet kubernetes.Interface, stopCh <-chan struct{
7984 )
8085 informer .AddEventHandler (k8scache.ResourceEventHandlerFuncs {
8186 AddFunc : func (obj interface {}) {
82- if resourceMatchACKRoleAccountsConfigMap (obj ) {
87+ if resourceMatchCARMConfigMap (obj , name ) {
8388 cm := obj .(* corev1.ConfigMap )
8489 object := cm .DeepCopy ()
8590 // To avoid multiple mutex locks, we are updating the cache
8691 // and the configmap existence flag in the same function.
8792 configMapCreated := true
88- c .updateAccountRoleData (configMapCreated , object .Data )
93+ c .updateData (configMapCreated , object .Data )
8994 c .log .V (1 ).Info ("created account config map" , "name" , cm .ObjectMeta .Name )
9095 }
9196 },
9297 UpdateFunc : func (orig , desired interface {}) {
93- if resourceMatchACKRoleAccountsConfigMap (desired ) {
98+ if resourceMatchCARMConfigMap (desired , name ) {
9499 cm := desired .(* corev1.ConfigMap )
95100 object := cm .DeepCopy ()
96101 //TODO(a-hilaly): compare data checksum before updating the cache
97- c .updateAccountRoleData (true , object .Data )
102+ c .updateData (true , object .Data )
98103 c .log .V (1 ).Info ("updated account config map" , "name" , cm .ObjectMeta .Name )
99104 }
100105 },
101106 DeleteFunc : func (obj interface {}) {
102- if resourceMatchACKRoleAccountsConfigMap (obj ) {
107+ if resourceMatchCARMConfigMap (obj , name ) {
103108 cm := obj .(* corev1.ConfigMap )
104109 newMap := make (map [string ]string )
105110 // To avoid multiple mutex locks, we are updating the cache
106111 // and the configmap existence flag in the same function.
107112 configMapCreated := false
108- c .updateAccountRoleData (configMapCreated , newMap )
113+ c .updateData (configMapCreated , newMap )
109114 c .log .V (1 ).Info ("deleted account config map" , "name" , cm .ObjectMeta .Name )
110115 }
111116 },
112117 })
113118 go informer .Run (stopCh )
114119}
115120
116- // GetAccountRoleARN queries the AWS accountID associated Role ARN
121+ // GetValue queries the value
117122// from the cached CARM configmap. It will return an error if the
118- // configmap is not found, the accountID is not found or the role ARN
123+ // configmap is not found, the key is not found or the value
119124// is empty.
120125//
121126// This function is thread safe.
122- func (c * AccountCache ) GetAccountRoleARN ( accountID string ) (string , error ) {
127+ func (c * CARMMap ) GetValue ( key string ) (string , error ) {
123128 c .RLock ()
124129 defer c .RUnlock ()
125130
126131 if ! c .configMapCreated {
127132 return "" , ErrCARMConfigMapNotFound
128133 }
129- roleARN , ok := c .roleARNs [ accountID ]
134+ roleARN , ok := c .data [ key ]
130135 if ! ok {
131- return "" , ErrAccountIDNotFound
136+ return "" , ErrKeyNotFound
132137 }
133138 if roleARN == "" {
134- return "" , ErrEmptyRoleARN
139+ return "" , ErrEmptyValue
135140 }
136141 return roleARN , nil
137142}
138143
139- // updateAccountRoleData updates the CARM map. This function is thread safe.
140- func (c * AccountCache ) updateAccountRoleData (exist bool , data map [string ]string ) {
144+ // updateData updates the CARM map. This function is thread safe.
145+ func (c * CARMMap ) updateData (exist bool , data map [string ]string ) {
141146 c .Lock ()
142147 defer c .Unlock ()
143- c .roleARNs = data
148+ c .data = data
144149 c .configMapCreated = exist
145150}
0 commit comments