@@ -40,7 +40,7 @@ import (
4040 ctrl "sigs.k8s.io/controller-runtime"
4141 "sigs.k8s.io/controller-runtime/pkg/client"
4242
43- v1alpha1 "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/api/v1alpha1"
43+ "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/api/v1alpha1"
4444)
4545
4646const (
@@ -66,13 +66,20 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
6666 ctx , cancel := context .WithCancel (ctx )
6767 defer cancel ()
6868
69- r .Log .Debug ("reconciling ServiceExport" , "Namespace" , req .Namespace , "Name" , req .NamespacedName )
69+ namespace := req .Namespace
70+ name := req .NamespacedName
71+ r .Log .Debug ("reconciling ServiceExport" , "Namespace" , namespace , "Name" , name )
7072
7173 serviceExport := v1alpha1.ServiceExport {}
72- if err := r .Client .Get (ctx , req .NamespacedName , & serviceExport ); err != nil {
73- r .Log .Error (err , "error fetching ServiceExport" ,
74- "Namespace" , serviceExport .Namespace , "Name" , serviceExport .Name )
75- return ctrl.Result {}, client .IgnoreNotFound (err )
74+ if err := r .Client .Get (ctx , name , & serviceExport ); err != nil {
75+ if errors .IsNotFound (err ) {
76+ r .Log .Debug ("no ServiceExport found" ,
77+ "Namespace" , namespace , "Name" , name )
78+ } else {
79+ r .Log .Error (err , "error fetching ServiceExport" ,
80+ "Namespace" , namespace , "Name" , name )
81+ }
82+ return ctrl.Result {}, nil
7683 }
7784
7885 // Mark ServiceExport to be deleted, which is indicated by the deletion timestamp being set.
@@ -82,14 +89,14 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques
8289 namespacedName := types.NamespacedName {Namespace : serviceExport .Namespace , Name : serviceExport .Name }
8390 if err := r .Client .Get (ctx , namespacedName , & service ); err != nil {
8491 if errors .IsNotFound (err ) {
85- r .Log .Error ( err , "no Service found for ServiceExport" ,
92+ r .Log .Info ( "no Service found, deleting the ServiceExport" ,
8693 "Namespace" , serviceExport .Namespace , "Name" , serviceExport .Name )
8794 // Mark ServiceExport to be deleted, if the corresponding Service is not found
8895 isServiceExportMarkedForDelete = true
8996 } else {
90- r .Log .Error (err , "error fetching service " ,
97+ r .Log .Error (err , "error fetching Service " ,
9198 "Namespace" , serviceExport .Namespace , "Name" , serviceExport .Name )
92- return ctrl.Result {}, err
99+ return ctrl.Result {}, nil
93100 }
94101 }
95102
@@ -112,18 +119,30 @@ func (r *ServiceExportReconciler) handleUpdate(ctx context.Context, serviceExpor
112119 }
113120 }
114121
122+ if len (serviceExport .GetOwnerReferences ()) == 0 {
123+ err := controllerutil .SetControllerReference (service , serviceExport , r .Scheme )
124+ if err == nil {
125+ err = r .Client .Update (ctx , serviceExport )
126+ }
127+ if err != nil {
128+ r .Log .Error (err , "error setting Service as an owner of the ServiceExport" ,
129+ "namespace" , service .Namespace , "name" , service .Name )
130+ return ctrl.Result {}, err
131+ }
132+ }
133+
115134 r .Log .Info ("updating Cloud Map service" , "namespace" , service .Namespace , "name" , service .Name )
116135 cmService , err := r .createOrGetCloudMapService (ctx , service )
117136 if err != nil {
118- r .Log .Error (err , "error fetching service from Cloud Map" ,
137+ r .Log .Error (err , "error fetching Service from Cloud Map" ,
119138 "namespace" , service .Namespace , "name" , service .Name )
120139 return ctrl.Result {}, err
121140 }
122141
123142 endpoints , err := r .extractEndpoints (ctx , service )
124143 if err != nil {
125- r .Log .Error (err , "error extracting endpoints " ,
126- "Namespace " , serviceExport .Namespace , "Name " , serviceExport .Name )
144+ r .Log .Error (err , "error extracting Endpoints " ,
145+ "namespace " , serviceExport .Namespace , "name " , serviceExport .Name )
127146 return ctrl.Result {}, err
128147 }
129148
@@ -140,15 +159,15 @@ func (r *ServiceExportReconciler) handleUpdate(ctx context.Context, serviceExpor
140159 upserts = append (upserts , changes .Update ... )
141160
142161 if err := r .CloudMap .RegisterEndpoints (ctx , service .Namespace , service .Name , upserts ); err != nil {
143- r .Log .Error (err , "error registering endpoints to Cloud Map" ,
162+ r .Log .Error (err , "error registering Endpoints to Cloud Map" ,
144163 "namespace" , service .Namespace , "name" , service .Name )
145164 return ctrl.Result {}, err
146165 }
147166 }
148167
149168 if changes .HasDeletes () {
150169 if err := r .CloudMap .DeleteEndpoints (ctx , service .Namespace , service .Name , changes .Delete ); err != nil {
151- r .Log .Error (err , "error deleting endpoints from Cloud Map" ,
170+ r .Log .Error (err , "error deleting Endpoints from Cloud Map" ,
152171 "namespace" , cmService .Namespace , "name" , cmService .Name )
153172 return ctrl.Result {}, err
154173 }
@@ -170,7 +189,7 @@ func (r *ServiceExportReconciler) createOrGetCloudMapService(ctx context.Context
170189 if cmService == nil {
171190 err = r .CloudMap .CreateService (ctx , service .Namespace , service .Name )
172191 if err != nil {
173- r .Log .Error (err , "error creating a new service in Cloud Map" ,
192+ r .Log .Error (err , "error creating a new Service in Cloud Map" ,
174193 "namespace" , service .Namespace , "name" , service .Name )
175194 return nil , err
176195 }
@@ -188,13 +207,13 @@ func (r *ServiceExportReconciler) handleDelete(ctx context.Context, serviceExpor
188207
189208 cmService , err := r .CloudMap .GetService (ctx , serviceExport .Namespace , serviceExport .Name )
190209 if err != nil {
191- r .Log .Error (err , "error fetching service from Cloud Map" ,
210+ r .Log .Error (err , "error fetching Service from Cloud Map" ,
192211 "namespace" , serviceExport .Namespace , "name" , serviceExport .Name )
193212 return ctrl.Result {}, err
194213 }
195214 if cmService != nil {
196215 if err := r .CloudMap .DeleteEndpoints (ctx , cmService .Namespace , cmService .Name , cmService .Endpoints ); err != nil {
197- r .Log .Error (err , "error deleting endpoints from Cloud Map" ,
216+ r .Log .Error (err , "error deleting Endpoints from Cloud Map" ,
198217 "namespace" , cmService .Namespace , "name" , cmService .Name )
199218 return ctrl.Result {}, err
200219 }
0 commit comments