Skip to content

CLOUDP-309306: Project reconciler incorrectly sets PE status for unmanaged resources #2236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 31, 2025
Merged

CLOUDP-309306: Project reconciler incorrectly sets PE status for unmanaged resources #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73462f1
Do not set status for unmanaged private endpoint(s)
helderjs Mar 27, 2025
492ee77
remove commented code
helderjs Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/controller/atlasproject/private_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,10 +590,18 @@ func mapLastAppliedPrivateEndpoint(atlasProject *akov2.AtlasProject) (map[string

func hasManagedPrivateEndpoints(specPEs []akov2.PrivateEndpoint, atlasPEs []atlasPE, lastAppliedPEs map[string]akov2.PrivateEndpoint) bool {
for _, pe := range atlasPEs {
// if any of the PE in atlas was previously managed, return true
if _, ok := lastAppliedPEs[pe.Identifier().(string)]; ok {
return true
}
}

return len(set.DeprecatedDifference(specPEs, atlasPEs)) == 0
// if any of the PE in atlas is specified in the spec, return true
a := set.DeprecatedIntersection(specPEs, atlasPEs)
if len(specPEs) > 0 && len(a) > 0 {
return true
}

// if there are not managed or previously managed entries, return false
return false
}
87 changes: 70 additions & 17 deletions internal/controller/atlasproject/private_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"fmt"
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
Expand All @@ -13,6 +15,7 @@ import (
"go.uber.org/zap/zaptest"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/controller/atlas"
Expand Down Expand Up @@ -215,41 +218,81 @@ func TestPrivateEndpointsNonGreedyBehaviour(t *testing.T) {
atlasPEids []string
wantRemoved []string
wantResult workflow.Result
conditions []api.Condition
}{
{
title: "no last applied no removal in Atlas",
title: "empty last applied, empty spec, two entries in atlas: shouldn't remove entries",
lastAppliedPEids: []string{},
specPEids: []string{},
atlasPEids: []string{"pe1", "pe2"},
wantRemoved: []string{},
wantResult: workflow.OK(),
conditions: []api.Condition{},
},
{
title: "removed from last applied removes from Atlas",
title: "empty last applied, a entry in spec, two entries in atlas: shouldn't remove missing entry",
lastAppliedPEids: []string{},
specPEids: []string{"pe1"},
atlasPEids: []string{"pe1", "pe2"},
wantRemoved: []string{},
wantResult: workflow.OK().WithMessage("Interface Private Endpoint awaits configuration"),
conditions: []api.Condition{
api.TrueCondition(api.PrivateEndpointServiceReadyType).
WithMessageRegexp("Interface Private Endpoint awaits configuration"),
},
},
{
title: "empty last applied, one entry in spec, empty atlas: no remove action",
lastAppliedPEids: []string{},
specPEids: []string{"pe1"},
atlasPEids: []string{},
wantRemoved: []string{},
wantResult: notReadyServiceResult,
conditions: []api.Condition{
api.FalseCondition(api.PrivateEndpointServiceReadyType).
WithReason(string(workflow.ProjectPEServiceIsNotReadyInAtlas)).
WithMessageRegexp("Private Endpoint Service is not ready"),
},
},
{
title: "two entries in last applied, one entry in spec, two entries in atlas: should remove one entry",
lastAppliedPEids: []string{"pe1", "pe2"},
specPEids: []string{"pe1"},
atlasPEids: []string{"pe1", "pe2"},
wantRemoved: []string{"pe2"},
wantResult: workflow.InProgress(
workflow.ProjectPEServiceIsNotReadyInAtlas, "Private Endpoint is deleting"),
conditions: []api.Condition{
api.FalseCondition(api.PrivateEndpointServiceReadyType).
WithReason(string(workflow.ProjectPEServiceIsNotReadyInAtlas)).
WithMessageRegexp("Private Endpoint is deleting"),
},
},
{
title: "removed all from last applied removes all from Atlas",
title: "two entries in last applied, empty spec, two entries in atlas: should remove entries",
lastAppliedPEids: []string{"pe1", "pe2"},
specPEids: []string{},
atlasPEids: []string{"pe1", "pe2"},
wantRemoved: []string{"pe1", "pe2"},
wantResult: workflow.InProgress(
workflow.ProjectPEServiceIsNotReadyInAtlas, "Private Endpoint is deleting"),
conditions: []api.Condition{
api.FalseCondition(api.PrivateEndpointServiceReadyType).
WithReason(string(workflow.ProjectPEServiceIsNotReadyInAtlas)).
WithMessageRegexp("Private Endpoint is deleting"),
},
},
{
title: "not in last applied not removed from Atlas",
title: "an entry in last applied, an entry in spec, two entries in atlas: shouldn't remove an entry",
lastAppliedPEids: []string{"pe1"},
specPEids: []string{"pe1"},
atlasPEids: []string{"pe1", "pe2"},
wantRemoved: []string{},
wantResult: workflow.InProgress(
workflow.ProjectPrivateEndpointIsNotReadyInAtlas, "Interface Private Endpoint is not ready"),
wantResult: workflow.OK().WithMessage("Interface Private Endpoint awaits configuration"),
conditions: []api.Condition{
api.TrueCondition(api.PrivateEndpointServiceReadyType).
WithMessageRegexp("Interface Private Endpoint awaits configuration"),
},
},
} {
t.Run(tc.title, func(t *testing.T) {
Expand Down Expand Up @@ -279,20 +322,18 @@ func TestPrivateEndpointsNonGreedyBehaviour(t *testing.T) {

removals := len(tc.wantRemoved)
if removals > 0 {
privateEndpointsAPI.EXPECT().DeletePrivateEndpointServiceWithParams(
mock.Anything, mock.Anything,
).Return(admin.DeletePrivateEndpointServiceApiRequest{ApiService: privateEndpointsAPI}).Times(removals)
privateEndpointsAPI.EXPECT().DeletePrivateEndpointServiceWithParams(mock.Anything, mock.Anything).
Return(admin.DeletePrivateEndpointServiceApiRequest{ApiService: privateEndpointsAPI}).Times(removals)
privateEndpointsAPI.EXPECT().DeletePrivateEndpointServiceExecute(
mock.AnythingOfType("admin.DeletePrivateEndpointServiceApiRequest")).Return(
nil, nil, nil,
).Times(removals)
}
privateEndpointsAPI.EXPECT().CreatePrivateEndpointWithParams(
mock.Anything, mock.Anything,
).Return(admin.CreatePrivateEndpointApiRequest{ApiService: privateEndpointsAPI}).Maybe()
privateEndpointsAPI.EXPECT().CreatePrivateEndpointExecute(
mock.AnythingOfType("admin.CreatePrivateEndpointApiRequest")).Return(
nil, nil, nil,
privateEndpointsAPI.EXPECT().CreatePrivateEndpointService(mock.Anything, mock.Anything, mock.Anything).
Return(admin.CreatePrivateEndpointServiceApiRequest{ApiService: privateEndpointsAPI}).Maybe()
privateEndpointsAPI.EXPECT().CreatePrivateEndpointServiceExecute(
mock.AnythingOfType("admin.CreatePrivateEndpointServiceApiRequest")).Return(
&admin.EndpointService{CloudProvider: "AWS", RegionName: pointer.MakePtr("fake-region-pe1")}, nil, nil,
).Maybe()

workflowCtx := workflow.Context{
Expand All @@ -307,6 +348,19 @@ func TestPrivateEndpointsNonGreedyBehaviour(t *testing.T) {

result := ensurePrivateEndpoint(&workflowCtx, prj)
require.Equal(t, tc.wantResult, result)
t.Log(cmp.Diff(
tc.conditions,
workflowCtx.Conditions(),
cmpopts.IgnoreFields(api.Condition{}, "LastTransitionTime"),
))
assert.True(
t,
cmp.Equal(
tc.conditions,
workflowCtx.Conditions(),
cmpopts.IgnoreFields(api.Condition{}, "LastTransitionTime"),
),
)
})
}
}
Expand All @@ -328,7 +382,6 @@ func synthesizePEs(peIDs []string) []akov2.PrivateEndpoint {
for _, id := range peIDs {
pes = append(pes, akov2.PrivateEndpoint{
Provider: "AWS",
ID: id,
Region: fmt.Sprintf("fake-region-%s", id),
})
}
Expand All @@ -340,7 +393,7 @@ func synthesizeAtlasPEs(peIDs []string) []admin.EndpointService {
for _, id := range peIDs {
atlasPEs = append(atlasPEs, admin.EndpointService{
CloudProvider: "AWS",
Id: pointer.MakePtr(id),
Id: pointer.MakePtr(id + "-id"),
RegionName: pointer.MakePtr(fmt.Sprintf("fake-region-%s", id)),
Status: pointer.MakePtr("AVAILABLE"),
})
Expand Down
Loading