From 62bd318a658f359d875e012a124026d3f941b3d9 Mon Sep 17 00:00:00 2001 From: matthewgoodman13 Date: Mon, 13 Jun 2022 21:24:08 +0000 Subject: [PATCH 1/4] Added managed by label - issue 110 --- pkg/controllers/cloudmap_controller_test.go | 1 + pkg/controllers/utils.go | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/controllers/cloudmap_controller_test.go b/pkg/controllers/cloudmap_controller_test.go index 023bd7db..d48d0ebe 100644 --- a/pkg/controllers/cloudmap_controller_test.go +++ b/pkg/controllers/cloudmap_controller_test.go @@ -68,6 +68,7 @@ func TestCloudMapReconciler_Reconcile(t *testing.T) { assert.NoError(t, err) endpointSlice := endpointSliceList.Items[0] assert.Equal(t, test.SvcName, endpointSlice.Labels["multicluster.kubernetes.io/service-name"], "Endpoint slice is created") + assert.Contains(t, endpointSlice.Labels, LabelEntityManagedBy, "Managed by label is added") assert.Equal(t, int32(test.Port1), *endpointSlice.Ports[0].Port) assert.Equal(t, test.EndptIp1, endpointSlice.Endpoints[0].Addresses[0]) } diff --git a/pkg/controllers/utils.go b/pkg/controllers/utils.go index 517a8f92..803c1ba0 100644 --- a/pkg/controllers/utils.go +++ b/pkg/controllers/utils.go @@ -20,6 +20,12 @@ const ( // LabelServiceImportName indicates the name of the multi-cluster service that an EndpointSlice belongs to. LabelServiceImportName = "multicluster.kubernetes.io/service-name" + + // LabelEntityManagedBy indicates the name of the entity that manages the EndpointSlice. + LabelEntityManagedBy = "multicluster.kubernetes.io/managed-by" + + // ValueEntityManagedBy indicates the name of the entity that manages the EndpointSlice. + ValueEntityManagedBy = "aws-cloud-map-mcs-controller-for-k8s" ) // ServicePortToPort converts a k8s service port to internal model port @@ -203,8 +209,12 @@ func CreateEndpointSliceStruct(svc *v1.Service, svcImportName string) *discovery return &discovery.EndpointSlice{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ - discovery.LabelServiceName: svc.Name, // derived Service name - LabelServiceImportName: svcImportName, // original ServiceImport name + // derived Service name + discovery.LabelServiceName: svc.Name, + // original ServiceImport name + LabelServiceImportName: svcImportName, + // 'managed-by' label set to controller + LabelEntityManagedBy: ValueEntityManagedBy, }, GenerateName: svc.Name + "-", OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(svc, schema.GroupVersionKind{ From 77dfc82ac93efd5c6f89e39a77084e767ac53ada Mon Sep 17 00:00:00 2001 From: Matthew Goodman Date: Mon, 13 Jun 2022 14:58:25 -0700 Subject: [PATCH 2/4] Update utils.go --- pkg/controllers/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/utils.go b/pkg/controllers/utils.go index 803c1ba0..ef1722fb 100644 --- a/pkg/controllers/utils.go +++ b/pkg/controllers/utils.go @@ -22,7 +22,7 @@ const ( LabelServiceImportName = "multicluster.kubernetes.io/service-name" // LabelEntityManagedBy indicates the name of the entity that manages the EndpointSlice. - LabelEntityManagedBy = "multicluster.kubernetes.io/managed-by" + LabelEntityManagedBy = "endpointslice.kubernetes.io/managed-by" // ValueEntityManagedBy indicates the name of the entity that manages the EndpointSlice. ValueEntityManagedBy = "aws-cloud-map-mcs-controller-for-k8s" From a4ef4d05e11a6445c5953d72698b3671b3644f30 Mon Sep 17 00:00:00 2001 From: matthewgoodman13 Date: Mon, 13 Jun 2022 22:40:37 +0000 Subject: [PATCH 3/4] rename constants --- pkg/controllers/utils.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controllers/utils.go b/pkg/controllers/utils.go index ef1722fb..5465a3c6 100644 --- a/pkg/controllers/utils.go +++ b/pkg/controllers/utils.go @@ -21,11 +21,11 @@ const ( // LabelServiceImportName indicates the name of the multi-cluster service that an EndpointSlice belongs to. LabelServiceImportName = "multicluster.kubernetes.io/service-name" - // LabelEntityManagedBy indicates the name of the entity that manages the EndpointSlice. - LabelEntityManagedBy = "endpointslice.kubernetes.io/managed-by" + // LabelEndpointSliceManagedBy indicates the name of the entity that manages the EndpointSlice. + LabelEndpointSliceManagedBy = "endpointslice.kubernetes.io/managed-by" - // ValueEntityManagedBy indicates the name of the entity that manages the EndpointSlice. - ValueEntityManagedBy = "aws-cloud-map-mcs-controller-for-k8s" + // ValueEndpointSliceManagedBy indicates the name of the entity that manages the EndpointSlice. + ValueEndpointSliceManagedBy = "aws-cloud-map-mcs-controller-for-k8s" ) // ServicePortToPort converts a k8s service port to internal model port @@ -214,7 +214,7 @@ func CreateEndpointSliceStruct(svc *v1.Service, svcImportName string) *discovery // original ServiceImport name LabelServiceImportName: svcImportName, // 'managed-by' label set to controller - LabelEntityManagedBy: ValueEntityManagedBy, + LabelEndpointSliceManagedBy: ValueEndpointSliceManagedBy, }, GenerateName: svc.Name + "-", OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(svc, schema.GroupVersionKind{ From 2e4a44eb3ed86948ffdf4c05b3872b345353a7db Mon Sep 17 00:00:00 2001 From: Matthew Goodman Date: Mon, 13 Jun 2022 15:50:59 -0700 Subject: [PATCH 4/4] Update cloudmap_controller_test.go --- pkg/controllers/cloudmap_controller_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controllers/cloudmap_controller_test.go b/pkg/controllers/cloudmap_controller_test.go index d48d0ebe..f4c97e7e 100644 --- a/pkg/controllers/cloudmap_controller_test.go +++ b/pkg/controllers/cloudmap_controller_test.go @@ -68,7 +68,7 @@ func TestCloudMapReconciler_Reconcile(t *testing.T) { assert.NoError(t, err) endpointSlice := endpointSliceList.Items[0] assert.Equal(t, test.SvcName, endpointSlice.Labels["multicluster.kubernetes.io/service-name"], "Endpoint slice is created") - assert.Contains(t, endpointSlice.Labels, LabelEntityManagedBy, "Managed by label is added") + assert.Contains(t, endpointSlice.Labels, LabelEndpointSliceManagedBy, "Managed by label is added") assert.Equal(t, int32(test.Port1), *endpointSlice.Ports[0].Port) assert.Equal(t, test.EndptIp1, endpointSlice.Endpoints[0].Addresses[0]) }