Skip to content

Commit 87d6b78

Browse files
Merge pull request #1 from aws/main
Added managed by label - issue 110 (aws#139)
2 parents d2df88b + 80d6271 commit 87d6b78

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

pkg/controllers/cloudmap_controller_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func TestCloudMapReconciler_Reconcile(t *testing.T) {
6868
assert.NoError(t, err)
6969
endpointSlice := endpointSliceList.Items[0]
7070
assert.Equal(t, test.SvcName, endpointSlice.Labels["multicluster.kubernetes.io/service-name"], "Endpoint slice is created")
71+
assert.Contains(t, endpointSlice.Labels, LabelEndpointSliceManagedBy, "Managed by label is added")
7172
assert.Equal(t, int32(test.Port1), *endpointSlice.Ports[0].Port)
7273
assert.Equal(t, test.EndptIp1, endpointSlice.Endpoints[0].Addresses[0])
7374
}

pkg/controllers/utils.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ const (
2020

2121
// LabelServiceImportName indicates the name of the multi-cluster service that an EndpointSlice belongs to.
2222
LabelServiceImportName = "multicluster.kubernetes.io/service-name"
23+
24+
// LabelEndpointSliceManagedBy indicates the name of the entity that manages the EndpointSlice.
25+
LabelEndpointSliceManagedBy = "endpointslice.kubernetes.io/managed-by"
26+
27+
// ValueEndpointSliceManagedBy indicates the name of the entity that manages the EndpointSlice.
28+
ValueEndpointSliceManagedBy = "aws-cloud-map-mcs-controller-for-k8s"
2329
)
2430

2531
// ServicePortToPort converts a k8s service port to internal model port
@@ -203,8 +209,12 @@ func CreateEndpointSliceStruct(svc *v1.Service, svcImportName string) *discovery
203209
return &discovery.EndpointSlice{
204210
ObjectMeta: metav1.ObjectMeta{
205211
Labels: map[string]string{
206-
discovery.LabelServiceName: svc.Name, // derived Service name
207-
LabelServiceImportName: svcImportName, // original ServiceImport name
212+
// derived Service name
213+
discovery.LabelServiceName: svc.Name,
214+
// original ServiceImport name
215+
LabelServiceImportName: svcImportName,
216+
// 'managed-by' label set to controller
217+
LabelEndpointSliceManagedBy: ValueEndpointSliceManagedBy,
208218
},
209219
GenerateName: svc.Name + "-",
210220
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(svc, schema.GroupVersionKind{

0 commit comments

Comments
 (0)