New DerivedServices Architecture + Source-Cluster label (#179)

* Added managed by label - issue 110

* derived services + unit tests + label

* revisions and delete svc bug

* annotation readded. kind & janitor test changes.

* fix expected test result. cluster-id -> cluster

* rm derived services

Author: matthewgoodman13

config/crd/bases/multicluster.x-k8s.io_serviceimports.yaml

@@ -41,7 +41,6 @@ spec:
                   is ClusterSetIP.
                 items:
                   type: string
-                maxItems: 1
                 type: array
               ports:
                 items:

integration/janitor/api.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/cloudmap"
 	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
-	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	sd "github.com/aws/aws-sdk-go-v2/service/servicediscovery"
 )
@@ -21,9 +20,9 @@ type serviceDiscoveryJanitorApi struct {
 	janitorFacade SdkJanitorFacade
 }
 
-func NewServiceDiscoveryJanitorApiFromConfig(cfg *aws.Config) ServiceDiscoveryJanitorApi {
+func NewServiceDiscoveryJanitorApiFromConfig(cfg *aws.Config, clusterUtils common.ClusterUtils) ServiceDiscoveryJanitorApi {
 	return &serviceDiscoveryJanitorApi{
-		ServiceDiscoveryApi: cloudmap.NewServiceDiscoveryApiFromConfig(cfg, common.NewClusterUtilsForTest(test.ClusterId, test.ClusterSetId)),
+		ServiceDiscoveryApi: cloudmap.NewServiceDiscoveryApiFromConfig(cfg, clusterUtils),
 		janitorFacade:       NewSdkJanitorFacadeFromConfig(cfg),
 	}
 }

integration/janitor/api_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	janitorMock "github.com/aws/aws-cloud-map-mcs-controller-for-k8s/mocks/integration/janitor"
+	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
 	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/test"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	sd "github.com/aws/aws-sdk-go-v2/service/servicediscovery"
@@ -13,7 +14,7 @@ import (
 )
 
 func TestNewServiceDiscoveryJanitorApiFromConfig(t *testing.T) {
-	assert.NotNil(t, NewServiceDiscoveryJanitorApiFromConfig(&aws.Config{}))
+	assert.NotNil(t, NewServiceDiscoveryJanitorApiFromConfig(&aws.Config{}, common.ClusterUtils{}))
 }
 
 func TestServiceDiscoveryJanitorApi_DeleteNamespace_HappyCase(t *testing.T) {

integration/janitor/janitor.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/cloudmap"
+	"github.com/aws/aws-cloud-map-mcs-controller-for-k8s/pkg/common"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
 )
@@ -22,7 +23,7 @@ type cloudMapJanitor struct {
 }
 
 // NewDefaultJanitor returns a new janitor object.
-func NewDefaultJanitor() CloudMapJanitor {
+func NewDefaultJanitor(clusterId string, clusterSetId string) CloudMapJanitor {
 	awsCfg, err := config.LoadDefaultConfig(context.TODO())
 
 	if err != nil {
@@ -31,7 +32,7 @@ func NewDefaultJanitor() CloudMapJanitor {
 	}
 
 	return &cloudMapJanitor{
-		sdApi: NewServiceDiscoveryJanitorApiFromConfig(&awsCfg),
+		sdApi: NewServiceDiscoveryJanitorApiFromConfig(&awsCfg, common.NewClusterUtilsForTest(clusterId, clusterSetId)),
 		fail:  func() { os.Exit(1) },
 	}
 }

integration/janitor/janitor_test.go

@@ -21,7 +21,7 @@ type testJanitor struct {
 }
 
 func TestNewDefaultJanitor(t *testing.T) {
-	assert.NotNil(t, NewDefaultJanitor())
+	assert.NotNil(t, NewDefaultJanitor(test.ClusterId1, test.ClusterSetId1))
 }
 
 func TestCleanupHappyCase(t *testing.T) {

integration/janitor/runner/main.go

@@ -9,12 +9,15 @@ import (
 )
 
 func main() {
-	if len(os.Args) != 2 {
-		fmt.Println("Expected single namespace name argument")
+	if len(os.Args) != 4 {
+		fmt.Println("Expected namespace name, clusterId, clusterSetId arguments")
 		os.Exit(1)
 	}
 
-	j := janitor.NewDefaultJanitor()
 	nsName := os.Args[1]
+	clusterId := os.Args[2]
+	clusterSetId := os.Args[3]
+
+	j := janitor.NewDefaultJanitor(clusterId, clusterSetId)
 	j.Cleanup(context.TODO(), nsName)
 }

integration/kind-test/configs/e2e-clusterId.yaml

@@ -0,0 +1,13 @@
+apiVersion: about.k8s.io/v1alpha1
+kind: ClusterProperty
+metadata:
+  name: id.k8s.io
+spec:
+  value: kind-e2e-clusterid-1
+---
+apiVersion: about.k8s.io/v1alpha1
+kind: ClusterProperty
+metadata:
+  name: clusterset.k8s.io
+spec:
+  value: kind-e2e-clustersetid-1

integration/kind-test/configs/e2e-clusterSetId.yaml

@@ -11,6 +11,8 @@ export ENDPT_PORT=80
 export SERVICE_PORT=8080
 export KIND_SHORT='cloud-map-e2e'
 export CLUSTER='kind-cloud-map-e2e'
+export CLUSTERID1='kind-e2e-clusterid-1'
+export CLUSTERSETID1='kind-e2e-clustersetid-1'
 export IMAGE='kindest/node:v1.20.15@sha256:a6ce604504db064c5e25921c6c0fffea64507109a1f2a512b1b562ac37d652f3'
 export EXPECTED_ENDPOINT_COUNT=5
 export UPDATED_ENDPOINT_COUNT=6