Initial implementation of Cloud Map controller that imports remote services

Author: vanekjar

config/manager/kustomization.yaml

@@ -5,6 +5,12 @@ generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
-- name: manager-config
-  files:
+- files:
   - controller_manager_config.yaml
+  name: manager-config
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: controller
+  newTag: latest

config/rbac/role.yaml

@@ -28,24 +28,7 @@ rules:
   resources:
   - serviceimports
   verbs:
-  - create
-  - delete
   - get
   - list
   - patch
   - update
-  - watch
-- apiGroups:
-  - multicluster.k8s.aws
-  resources:
-  - serviceimports/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - multicluster.k8s.aws
-  resources:
-  - serviceimports/status
-  verbs:
-  - get
-  - patch
-  - update

main.go

@@ -19,7 +19,6 @@ package main
 import (
 	"context"
 	"flag"
-
 	"github.com/aws/aws-sdk-go-v2/config"
 	"os"
 
@@ -102,14 +101,17 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&controllers.ServiceImportReconciler{
-		Client: mgr.GetClient(),
-		Log:    ctrl.Log.WithName("controllers").WithName("ServiceImport"),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "ServiceImport")
+	cloudMapReconciler := &controllers.CloudMapReconciler{
+		Client:   mgr.GetClient(),
+		Cloudmap: cloudmap.NewServiceDiscoveryClient(&awsCfg),
+		Logger:   ctrl.Log.WithName("controllers").WithName("CloudMap"),
+	}
+
+	if err = mgr.Add(cloudMapReconciler); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "CloudMap")
 		os.Exit(1)
 	}
+
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

pkg/cloudmap/client.go

@@ -244,9 +244,8 @@ func (sdc *serviceDiscoveryClient) listServicesFromCloudMap(ctx context.Context,
 	svcs := make([]*types.ServiceSummary, 0)
 
 	nsId, nsErr := sdc.getNamespaceId(ctx, nsName)
-
 	if nsErr != nil {
-		return svcs, nsErr
+		return svcs, nil
 	}
 
 	filter := types.ServiceFilter{

pkg/cloudmap/endpoint_manager.go

@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	defaultEndpointsCacheTTL  = 5 * time.Minute
+	defaultEndpointsCacheTTL  = 5 * time.Second
 	defaultEndpointsCacheSize = 1024
 
 	defaultOperationPollInterval = 3 * time.Second