Skip to content
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

Jump to bottom

CLOUDP-222001: Move pkg/utils under internal #1316

Merged
merged 1 commit into from
Jan 12, 2024
Merged

CLOUDP-222001: Move pkg/utils under internal #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import (
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/featureflags"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatabaseuser"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatafederation"
Expand All @@ -54,7 +55,6 @@ import (
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasproject"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/post-install/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"go.uber.org/zap"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
0 pkg/util/collection/collection.go → internal/collection/collection.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/collection/collection_test.go → internal/collection/collection_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/util/comparation.go → internal/compare/comparation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package util
package compare

func IsEqualWithoutOrder[T comparable](a, b []T) bool {
if len(a) != len(b) {
Expand Down
0 pkg/util/compat/json_slice_merge.go → internal/compat/json_slice_merge.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/util/compat/json_slice_merge_test.go → internal/compat/json_slice_merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/require"

. "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
. "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
)

func TestJSONSliceMerge(t *testing.T) {
Expand Down
0 pkg/util/compat/jsoncopy.go → internal/compat/jsoncopy.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/util/compat/jsoncopy_test.go → internal/compat/jsoncopy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"

. "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
. "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
)

// JSONCopy will copy src to dst via JSON serialization/deserialization.
Expand Down
0 pkg/util/httputil/decoratedclient.go → internal/httputil/decoratedclient.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/httputil/decoratedclient_test.go → internal/httputil/decoratedclient_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/httputil/digestclient.go → internal/httputil/digestclient.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/httputil/loggedclient.go → internal/httputil/loggedclient.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/httputil/transportclient.go → internal/httputil/transportclient.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/kube/kube.go → internal/kube/kube.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/kube/kube_test.go → internal/kube/kube_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/set/identifiable.go → internal/set/identifiable.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/set/identifiable_test.go → internal/set/identifiable_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/stringutil/stringutil.go → internal/stringutil/stringutil.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/timeutil/timeutil.go → internal/timeutil/timeutil.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/timeutil/timeutil_test.go → internal/timeutil/timeutil_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/util/toptr/toptr.go → internal/toptr/toptr.go
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI you use this one a lot in the CLI which means you going to have a hard time with the update there

File renamed without changes.
12 changes: 6 additions & 6 deletions pkg/api/v1/alert_configurations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"go.mongodb.org/atlas/mongodbatlas"
"go.uber.org/zap"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compare"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
)

type AlertConfiguration struct {
Expand Down Expand Up @@ -231,9 +231,9 @@ func (in *Notification) IsEqual(notification mongodbatlas.Notification) bool {
in.ChannelName != notification.ChannelName ||
in.datadogAPIKey != notification.DatadogAPIKey ||
in.DatadogRegion != notification.DatadogRegion ||
!util.PtrValuesEqual(in.DelayMin, notification.DelayMin) ||
!compare.PtrValuesEqual(in.DelayMin, notification.DelayMin) ||
in.EmailAddress != notification.EmailAddress ||
!util.PtrValuesEqual(in.EmailEnabled, notification.EmailEnabled) ||
!compare.PtrValuesEqual(in.EmailEnabled, notification.EmailEnabled) ||
in.flowdockAPIToken != notification.FlowdockAPIToken ||
in.FlowName != notification.FlowName ||
in.IntervalMin != notification.IntervalMin ||
Expand All @@ -242,7 +242,7 @@ func (in *Notification) IsEqual(notification mongodbatlas.Notification) bool {
in.OpsGenieRegion != notification.OpsGenieRegion ||
in.OrgName != notification.OrgName ||
in.serviceKey != notification.ServiceKey ||
!util.PtrValuesEqual(in.SMSEnabled, notification.SMSEnabled) ||
!compare.PtrValuesEqual(in.SMSEnabled, notification.SMSEnabled) ||
in.TeamID != notification.TeamID ||
in.TeamName != notification.TeamName ||
in.TypeName != notification.TypeName ||
Expand All @@ -252,7 +252,7 @@ func (in *Notification) IsEqual(notification mongodbatlas.Notification) bool {
return false
}

if !util.IsEqualWithoutOrder(in.Roles, notification.Roles) {
if !compare.IsEqualWithoutOrder(in.Roles, notification.Roles) {
return false
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasbackupschedule_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/go-test/deep"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
)

func Test_BackupScheduleToAtlas(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasdatabaseuser_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

// Important:
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasdatafederation_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasdatafederation_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
)

func TestAtlasDataFederation_ToAtlas(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/v1/atlasdeployment_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasdeployment_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasfederatedauth_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasfederatedauth_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
)

func Test_FederatedAuthSpec_ToAtlas(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasproject_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

// Important:
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasteam_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v1

import (
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"

"go.mongodb.org/atlas/mongodbatlas"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/auditing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
)

// Auditing represents MongoDB Maintenance Windows
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/custom_roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/toptr"
)

func TestAtlasCustomRoles_ToAtlas(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/encryption_at_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1

import (
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"

"go.mongodb.org/atlas/mongodbatlas"

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/networkpeer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1
import (
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
)

type NetworkPeer struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/privateendpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
)

type PrivateEndpoint struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/project/ipaccesslist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
)

type IPAccessList struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/project_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1
import (
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
)

type ProjectSettings struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/status/atlasdeployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package status
import (
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
)

// AtlasDeploymentStatus defines the observed state of AtlasDeployment.
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/status/backuppolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package status

import "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/collection"
import "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/collection"

// +k8s:deepcopy-gen=false

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/status/backupschedule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package status

import "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/collection"
import "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/collection"

// +k8s:deepcopy-gen=false

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlas/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/httputil"
akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/httputil"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/atlasdatabaseuser/databaseuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/timeutil"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdeployment"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/timeutil"
)

func (r *AtlasDatabaseUserReconciler) ensureDatabaseUser(ctx *workflow.Context, project mdbv1.AtlasProject, dbUser mdbv1.AtlasDatabaseUser) workflow.Result {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlasdatabaseuser/databaseuser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlasdatafederation/connectionsecrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/stringutil"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/stringutil"
)

func (r *AtlasDataFederationReconciler) ensureConnectionSecrets(ctx *workflow.Context, project *mdbv1.AtlasProject, df *mdbv1.AtlasDataFederation) workflow.Result {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlasdatafederation/datafederation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"go.uber.org/zap"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/compat"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat"
)

func (r *AtlasDataFederationReconciler) ensureDataFederation(ctx *workflow.Context, project *mdbv1.AtlasProject, dataFederation *mdbv1.AtlasDataFederation) workflow.Result {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlasdatafederation/datafederation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/predicate"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/kube"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/statushandler"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube"
)

// AtlasDataFederationReconciler reconciles an DataFederation object
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/atlasdatafederation/private_endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package atlasdatafederation
import (
"context"

"github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/set"
mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow"
"github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/set"
)

func (r *AtlasDataFederationReconciler) ensurePrivateEndpoints(ctx *workflow.Context, project *mdbv1.AtlasProject, dataFederation *mdbv1.AtlasDataFederation) workflow.Result {
Expand Down
Loading
Loading