diff --git a/.github/workflows/test-e2e-gov.yml b/.github/workflows/test-e2e-gov.yml index e67c4bb659..b965239c43 100644 --- a/.github/workflows/test-e2e-gov.yml +++ b/.github/workflows/test-e2e-gov.yml @@ -54,7 +54,7 @@ jobs: cd test/e2e ginkgo labels echo 'Running: AKO_E2E_TEST=1 ginkgo --label-filter="atlas-gov" --timeout 120m --nodes=10 --flake-attempts=1 --randomize-all --cover --v --trace --show-nodes-events --output-interceptor-mode=none' && \ - AKO_E2E_TEST=1 ginkgo --label-filter="atlas-gov" --timeout 120m --nodes=10 --flake-attempts=1 --randomize-all --cover --v --trace --show-node-events --output-interceptor-mode=none --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/pkg/... + AKO_E2E_TEST=1 ginkgo --label-filter="atlas-gov" --timeout 120m --nodes=10 --flake-attempts=1 --randomize-all --cover --v --trace --show-node-events --output-interceptor-mode=none --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/... - name: Upload operator logs if: ${{ failure() }} uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 917479e116..60e6f06047 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -265,7 +265,7 @@ jobs: # no `long-run`, no `broken` tests. `Long-run` tests run as a separate job [[ $TEST_NAME == 'long-run' ]] && filter='long-run && !broken' || filter="$TEST_NAME"' && !long-run && !broken' && \ echo 'Running: AKO_E2E_TEST=1 ginkgo --label-filter="${filter}" --timeout 120m --nodes=10 --cover --v' && \ - AKO_E2E_TEST=1 ginkgo --label-filter="${filter}" --timeout 120m --nodes=10 --flake-attempts=1 --cover --v --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/pkg/... + AKO_E2E_TEST=1 ginkgo --label-filter="${filter}" --timeout 120m --nodes=10 --flake-attempts=1 --cover --v --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/... - name: Upload operator logs if: ${{ failure() }} uses: actions/upload-artifact@v3 diff --git a/.github/workflows/test-int.yml b/.github/workflows/test-int.yml index 5c59b7b4f6..0a728689f9 100644 --- a/.github/workflows/test-int.yml +++ b/.github/workflows/test-int.yml @@ -67,7 +67,7 @@ jobs: go install github.com/onsi/gomega/... cd ${{ matrix.path }} - AKO_INT_TEST=1 ginkgo --label-filter="${TEST_NAME}" --timeout 90m --v --nodes="${PARALLEL_NODES}" --flake-attempts=1 --cover --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/pkg/... + AKO_INT_TEST=1 ginkgo --label-filter="${TEST_NAME}" --timeout 90m --v --nodes="${PARALLEL_NODES}" --flake-attempts=1 --cover --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/... - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/.golangci.yml b/.golangci.yml index bea1e680b5..7c50567a85 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -33,7 +33,7 @@ linters-settings: misspell: locale: US goimports: - local-prefixes: github.com/mongodb/mongodb-atlas-kubernetes + local-prefixes: github.com/mongodb/mongodb-atlas-kubernetes/v2 depguard: rules: all: diff --git a/Makefile b/Makefile index d15fe5e6e3..7af684fb12 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ OPERATOR_NAMESPACE = mongodb-atlas-system ATLAS_DOMAIN = https://cloud-qa.mongodb.com/ ATLAS_KEY_SECRET_NAME = mongodb-atlas-operator-api-key -BASE_GO_PACKAGE = github.com/mongodb/mongodb-atlas-kubernetes +BASE_GO_PACKAGE = github.com/mongodb/mongodb-atlas-kubernetes/v2 GO_LICENSES = go-licenses DISALLOWED_LICENSES = restricted,reciprocal @@ -159,7 +159,7 @@ bin/$(TARGET_OS)/$(TARGET_ARCH): bin/$(TARGET_OS)/$(TARGET_ARCH)/manager: $(GO_SOURCES) bin/$(TARGET_OS)/$(TARGET_ARCH) @echo "Building operator with version $(VERSION); $(TARGET_OS) - $(TARGET_ARCH)" - CGO_ENABLED=0 GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) go build -o $@ -ldflags="-X github.com/mongodb/mongodb-atlas-kubernetes/pkg/version.Version=$(VERSION)" cmd/manager/main.go + CGO_ENABLED=0 GOOS=$(TARGET_OS) GOARCH=$(TARGET_ARCH) go build -o $@ -ldflags="-X github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version.Version=$(VERSION)" cmd/manager/main.go @touch $@ bin/manager: bin/$(TARGET_OS)/$(TARGET_ARCH)/manager @@ -202,8 +202,8 @@ lint: golangci-lint run $(TIMESTAMPS_DIR)/fmt: $(GO_SOURCES) - @echo "goimports -local github.com/mongodb/mongodb-atlas-kubernetes -l -w \$$(GO_SOURCES)" - @goimports -local github.com/mongodb/mongodb-atlas-kubernetes -l -w $(GO_SOURCES) + @echo "goimports -local github.com/mongodb/mongodb-atlas-kubernetes/v2 -l -w \$$(GO_SOURCES)" + @goimports -local github.com/mongodb/mongodb-atlas-kubernetes/v2 -l -w $(GO_SOURCES) @mkdir -p $(TIMESTAMPS_DIR) && touch $@ .PHONY: fmt @@ -211,8 +211,8 @@ fmt: $(TIMESTAMPS_DIR)/fmt ## Run go fmt against code fix-lint: find . -name "*.go" -not -path "./vendor/*" -exec gofmt -w "{}" \; - goimports -local github.com/mongodb/mongodb-atlas-kubernetes -w ./pkg - goimports -local github.com/mongodb/mongodb-atlas-kubernetes -w ./test + goimports -local github.com/mongodb/mongodb-atlas-kubernetes/v2 -w ./pkg + goimports -local github.com/mongodb/mongodb-atlas-kubernetes/v2 -w ./test golangci-lint run --fix $(TIMESTAMPS_DIR)/vet: $(GO_SOURCES) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 1c7a5a3008..6a25451f84 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -42,16 +42,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/predicate" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatabaseuser" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatafederation" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasfederatedauth" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasproject" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatabaseuser" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatafederation" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdeployment" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasfederatedauth" + "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" ) const ( diff --git a/cmd/post-install/main.go b/cmd/post-install/main.go index 2c9d8fde1a..52862f2b1a 100644 --- a/cmd/post-install/main.go +++ b/cmd/post-install/main.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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" diff --git a/go.mod b/go.mod index 235e2f8dcf..5d8c209914 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/mongodb/mongodb-atlas-kubernetes +module github.com/mongodb/mongodb-atlas-kubernetes/v2 go 1.21 diff --git a/licenses.csv b/licenses.csv index aba3be948e..0070f79eb6 100644 --- a/licenses.csv +++ b/licenses.csv @@ -64,7 +64,7 @@ github.com/mitchellh/go-homedir,https://github.com/mitchellh/go-homedir/blob/v1. github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0 github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0 github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.0.5/COPYING,Apache-2.0 -github.com/mongodb/mongodb-atlas-kubernetes,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 +github.com/mongodb/mongodb-atlas-kubernetes/v2,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 github.com/montanaflynn/stats,https://github.com/montanaflynn/stats/blob/v0.7.0/LICENSE,MIT github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause github.com/onsi/ginkgo/v2,https://github.com/onsi/ginkgo/blob/v2.13.1/LICENSE,MIT diff --git a/pkg/api/v1/alert_configurations.go b/pkg/api/v1/alert_configurations.go index a2d305b2b7..af31d87c69 100644 --- a/pkg/api/v1/alert_configurations.go +++ b/pkg/api/v1/alert_configurations.go @@ -7,9 +7,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/api/v1/atlasbackuppolicy_types.go b/pkg/api/v1/atlasbackuppolicy_types.go index 5dcf9ee9ff..6570140a3a 100644 --- a/pkg/api/v1/atlasbackuppolicy_types.go +++ b/pkg/api/v1/atlasbackuppolicy_types.go @@ -11,7 +11,7 @@ package v1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) // AtlasBackupPolicySpec defines the desired state of AtlasBackupPolicy diff --git a/pkg/api/v1/atlasbackupschedule_types.go b/pkg/api/v1/atlasbackupschedule_types.go index f356cc62c6..032db55a3c 100644 --- a/pkg/api/v1/atlasbackupschedule_types.go +++ b/pkg/api/v1/atlasbackupschedule_types.go @@ -14,9 +14,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" ) // AtlasBackupScheduleSpec defines the desired state of AtlasBackupSchedule diff --git a/pkg/api/v1/atlasbackupschedule_types_test.go b/pkg/api/v1/atlasbackupschedule_types_test.go index 7bcf0573f9..42552cac9d 100644 --- a/pkg/api/v1/atlasbackupschedule_types_test.go +++ b/pkg/api/v1/atlasbackupschedule_types_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-test/deep" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func Test_BackupScheduleToAtlas(t *testing.T) { diff --git a/pkg/api/v1/atlascustomresource.go b/pkg/api/v1/atlascustomresource.go index 8e7a17361b..9b429f1a62 100644 --- a/pkg/api/v1/atlascustomresource.go +++ b/pkg/api/v1/atlascustomresource.go @@ -4,7 +4,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) //+k8s:deepcopy-gen=false diff --git a/pkg/api/v1/atlasdatabaseuser_types.go b/pkg/api/v1/atlasdatabaseuser_types.go index 28ef43bd2d..e080b5b6d2 100644 --- a/pkg/api/v1/atlasdatabaseuser_types.go +++ b/pkg/api/v1/atlasdatabaseuser_types.go @@ -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/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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: diff --git a/pkg/api/v1/atlasdatafederation_types.go b/pkg/api/v1/atlasdatafederation_types.go index 6ecbe00b03..f48a04ee5f 100644 --- a/pkg/api/v1/atlasdatafederation_types.go +++ b/pkg/api/v1/atlasdatafederation_types.go @@ -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/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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() { diff --git a/pkg/api/v1/atlasdatafederation_types_test.go b/pkg/api/v1/atlasdatafederation_types_test.go index bf08644f96..a63a6c722e 100644 --- a/pkg/api/v1/atlasdatafederation_types_test.go +++ b/pkg/api/v1/atlasdatafederation_types_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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) { diff --git a/pkg/api/v1/atlasdeployment_types.go b/pkg/api/v1/atlasdeployment_types.go index d99e70796e..e8b5c5739a 100644 --- a/pkg/api/v1/atlasdeployment_types.go +++ b/pkg/api/v1/atlasdeployment_types.go @@ -27,13 +27,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" + "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/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "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" ) func init() { diff --git a/pkg/api/v1/atlasdeployment_types_test.go b/pkg/api/v1/atlasdeployment_types_test.go index 99a0de2098..86bc954ea9 100644 --- a/pkg/api/v1/atlasdeployment_types_test.go +++ b/pkg/api/v1/atlasdeployment_types_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) var ( diff --git a/pkg/api/v1/atlasfederatedauth_types.go b/pkg/api/v1/atlasfederatedauth_types.go index 1f1419c5fa..0b41131b9a 100644 --- a/pkg/api/v1/atlasfederatedauth_types.go +++ b/pkg/api/v1/atlasfederatedauth_types.go @@ -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/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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() { diff --git a/pkg/api/v1/atlasfederatedauth_types_test.go b/pkg/api/v1/atlasfederatedauth_types_test.go index f10d97c994..fa66bcd943 100644 --- a/pkg/api/v1/atlasfederatedauth_types_test.go +++ b/pkg/api/v1/atlasfederatedauth_types_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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) { diff --git a/pkg/api/v1/atlasproject_types.go b/pkg/api/v1/atlasproject_types.go index fa284022f6..ea5295068e 100644 --- a/pkg/api/v1/atlasproject_types.go +++ b/pkg/api/v1/atlasproject_types.go @@ -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/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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: diff --git a/pkg/api/v1/atlasteam_types.go b/pkg/api/v1/atlasteam_types.go index a02d598460..5f12725f71 100644 --- a/pkg/api/v1/atlasteam_types.go +++ b/pkg/api/v1/atlasteam_types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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" diff --git a/pkg/api/v1/auditing.go b/pkg/api/v1/auditing.go index 75dc085294..6c13b28782 100644 --- a/pkg/api/v1/auditing.go +++ b/pkg/api/v1/auditing.go @@ -5,7 +5,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) // Auditing represents MongoDB Maintenance Windows diff --git a/pkg/api/v1/common/common.go b/pkg/api/v1/common/common.go index 848419a362..d9a999e64d 100644 --- a/pkg/api/v1/common/common.go +++ b/pkg/api/v1/common/common.go @@ -7,7 +7,7 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) /* diff --git a/pkg/api/v1/custom_roles_test.go b/pkg/api/v1/custom_roles_test.go index ee65c366cc..e58002f136 100644 --- a/pkg/api/v1/custom_roles_test.go +++ b/pkg/api/v1/custom_roles_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestAtlasCustomRoles_ToAtlas(t *testing.T) { diff --git a/pkg/api/v1/encryption_at_rest.go b/pkg/api/v1/encryption_at_rest.go index 8284c42a0d..e25ff98266 100644 --- a/pkg/api/v1/encryption_at_rest.go +++ b/pkg/api/v1/encryption_at_rest.go @@ -1,11 +1,11 @@ package v1 import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" ) // EncryptionAtRest allows to specify the Encryption at Rest for AWS, Azure and GCP providers diff --git a/pkg/api/v1/networkpeer.go b/pkg/api/v1/networkpeer.go index 1d5dbcad70..9053226d04 100644 --- a/pkg/api/v1/networkpeer.go +++ b/pkg/api/v1/networkpeer.go @@ -3,8 +3,8 @@ package v1 import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/api/v1/privateendpoint.go b/pkg/api/v1/privateendpoint.go index 52b023eb31..fa42f78e22 100644 --- a/pkg/api/v1/privateendpoint.go +++ b/pkg/api/v1/privateendpoint.go @@ -5,9 +5,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/api/v1/project/integration.go b/pkg/api/v1/project/integration.go index fb62d9e6ef..20fe4addfe 100644 --- a/pkg/api/v1/project/integration.go +++ b/pkg/api/v1/project/integration.go @@ -3,7 +3,7 @@ package project import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/api/v1/project/ipaccesslist.go b/pkg/api/v1/project/ipaccesslist.go index c21bf058f5..6ac4397621 100644 --- a/pkg/api/v1/project/ipaccesslist.go +++ b/pkg/api/v1/project/ipaccesslist.go @@ -5,7 +5,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" ) type IPAccessList struct { diff --git a/pkg/api/v1/project_settings.go b/pkg/api/v1/project_settings.go index cce3014183..87114d5be5 100644 --- a/pkg/api/v1/project_settings.go +++ b/pkg/api/v1/project_settings.go @@ -3,7 +3,7 @@ package v1 import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" ) type ProjectSettings struct { diff --git a/pkg/api/v1/project_teams.go b/pkg/api/v1/project_teams.go index 80c3c31df7..1b58ad0f15 100644 --- a/pkg/api/v1/project_teams.go +++ b/pkg/api/v1/project_teams.go @@ -3,7 +3,7 @@ package v1 import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" ) // +kubebuilder:validation:Enum=GROUP_OWNER;GROUP_CLUSTER_MANAGER;GROUP_DATA_ACCESS_ADMIN;GROUP_DATA_ACCESS_READ_WRITE;GROUP_DATA_ACCESS_READ_ONLY;GROUP_READ_ONLY diff --git a/pkg/api/v1/serverless_private_endpoint.go b/pkg/api/v1/serverless_private_endpoint.go index e24b445942..3d2f076c03 100644 --- a/pkg/api/v1/serverless_private_endpoint.go +++ b/pkg/api/v1/serverless_private_endpoint.go @@ -3,7 +3,7 @@ package v1 import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" ) type ServerlessPrivateEndpoint struct { diff --git a/pkg/api/v1/status/atlasdeployment.go b/pkg/api/v1/status/atlasdeployment.go index f62beb9f31..d175b78f73 100644 --- a/pkg/api/v1/status/atlasdeployment.go +++ b/pkg/api/v1/status/atlasdeployment.go @@ -3,7 +3,7 @@ package status import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" ) // AtlasDeploymentStatus defines the observed state of AtlasDeployment. diff --git a/pkg/api/v1/status/atlasproject.go b/pkg/api/v1/status/atlasproject.go index 432dede9bf..8f214abe1f 100644 --- a/pkg/api/v1/status/atlasproject.go +++ b/pkg/api/v1/status/atlasproject.go @@ -1,8 +1,8 @@ package status import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/authmode" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/authmode" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) // +k8s:deepcopy-gen=false diff --git a/pkg/api/v1/status/backuppolicy.go b/pkg/api/v1/status/backuppolicy.go index 4d050a1baf..9e8b6133ac 100644 --- a/pkg/api/v1/status/backuppolicy.go +++ b/pkg/api/v1/status/backuppolicy.go @@ -1,6 +1,6 @@ package status -import "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/collection" +import "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/collection" // +k8s:deepcopy-gen=false diff --git a/pkg/api/v1/status/backupschedule.go b/pkg/api/v1/status/backupschedule.go index 05080d25f9..a3a8fadf79 100644 --- a/pkg/api/v1/status/backupschedule.go +++ b/pkg/api/v1/status/backupschedule.go @@ -1,6 +1,6 @@ package status -import "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/collection" +import "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/collection" // +k8s:deepcopy-gen=false diff --git a/pkg/api/v1/status/networkpeer.go b/pkg/api/v1/status/networkpeer.go index 9696079e87..0f820ac99e 100644 --- a/pkg/api/v1/status/networkpeer.go +++ b/pkg/api/v1/status/networkpeer.go @@ -3,7 +3,7 @@ package status import ( "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" ) type AtlasNetworkPeer struct { diff --git a/pkg/api/v1/status/privateendpoint.go b/pkg/api/v1/status/privateendpoint.go index bc4b97810c..ec299d8eb4 100644 --- a/pkg/api/v1/status/privateendpoint.go +++ b/pkg/api/v1/status/privateendpoint.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" ) type ProjectPrivateEndpoint struct { diff --git a/pkg/api/v1/status/project_team.go b/pkg/api/v1/status/project_team.go index 515bae805e..745d3c6881 100644 --- a/pkg/api/v1/status/project_team.go +++ b/pkg/api/v1/status/project_team.go @@ -1,6 +1,6 @@ package status -import "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" +import "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" type ProjectTeamStatus struct { ID string `json:"id,omitempty"` diff --git a/pkg/api/v1/status/zz_generated.deepcopy.go b/pkg/api/v1/status/zz_generated.deepcopy.go index e9634ce69d..63f30346ac 100644 --- a/pkg/api/v1/status/zz_generated.deepcopy.go +++ b/pkg/api/v1/status/zz_generated.deepcopy.go @@ -14,8 +14,8 @@ a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 package status import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/authmode" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/authmode" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go index e7ef38af3c..a2fa698e8e 100644 --- a/pkg/api/v1/zz_generated.deepcopy.go +++ b/pkg/api/v1/zz_generated.deepcopy.go @@ -16,8 +16,8 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/pkg/controller/atlas/client.go b/pkg/controller/atlas/client.go index d3470b15e9..7a1b932bdb 100644 --- a/pkg/controller/atlas/client.go +++ b/pkg/controller/atlas/client.go @@ -5,12 +5,12 @@ import ( "net/http" "runtime" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/httputil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/httputil" ) // Client is the central place to create a client for Atlas using specified API keys and a server URL. diff --git a/pkg/controller/atlas/client_test.go b/pkg/controller/atlas/client_test.go index c3cf9e3d51..448230b04e 100644 --- a/pkg/controller/atlas/client_test.go +++ b/pkg/controller/atlas/client_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/httputil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/httputil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" ) func TestClientUserAgent(t *testing.T) { diff --git a/pkg/controller/atlas/connection_test.go b/pkg/controller/atlas/connection_test.go index c85e2bc909..fd3fc9a39a 100644 --- a/pkg/controller/atlas/connection_test.go +++ b/pkg/controller/atlas/connection_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) func Test_validateConnectionSecret(t *testing.T) { diff --git a/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go b/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go index 218a96f735..31b3be6690 100644 --- a/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go +++ b/pkg/controller/atlasdatabaseuser/atlasdatabaseuser_controller.go @@ -32,15 +32,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/source" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/validate" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + 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/connectionsecret" + "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/validate" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) // AtlasDatabaseUserReconciler reconciles an AtlasDatabaseUser object diff --git a/pkg/controller/atlasdatabaseuser/databaseuser.go b/pkg/controller/atlasdatabaseuser/databaseuser.go index c9afd3e253..ae6222be91 100644 --- a/pkg/controller/atlasdatabaseuser/databaseuser.go +++ b/pkg/controller/atlasdatabaseuser/databaseuser.go @@ -13,14 +13,14 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/controller/atlasdatabaseuser/databaseuser_test.go b/pkg/controller/atlasdatabaseuser/databaseuser_test.go index 15fb23e7d7..c13b5f63de 100644 --- a/pkg/controller/atlasdatabaseuser/databaseuser_test.go +++ b/pkg/controller/atlasdatabaseuser/databaseuser_test.go @@ -16,11 +16,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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() { diff --git a/pkg/controller/atlasdatafederation/connectionsecrets.go b/pkg/controller/atlasdatafederation/connectionsecrets.go index 1eabc9ca05..a53b134ad3 100644 --- a/pkg/controller/atlasdatafederation/connectionsecrets.go +++ b/pkg/controller/atlasdatafederation/connectionsecrets.go @@ -8,11 +8,11 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/controller/atlasdatafederation/datafederation.go b/pkg/controller/atlasdatafederation/datafederation.go index bdcce601e9..28931610ff 100644 --- a/pkg/controller/atlasdatafederation/datafederation.go +++ b/pkg/controller/atlasdatafederation/datafederation.go @@ -10,10 +10,10 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "go.uber.org/zap" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/controller/atlasdatafederation/datafederation_client.go b/pkg/controller/atlasdatafederation/datafederation_client.go index 0fb8406edb..caf6d6d049 100644 --- a/pkg/controller/atlasdatafederation/datafederation_client.go +++ b/pkg/controller/atlasdatafederation/datafederation_client.go @@ -9,7 +9,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) type DataFederationServiceOp service diff --git a/pkg/controller/atlasdatafederation/datafederation_controller.go b/pkg/controller/atlasdatafederation/datafederation_controller.go index ad10e2c9d5..904af9aeb1 100644 --- a/pkg/controller/atlasdatafederation/datafederation_controller.go +++ b/pkg/controller/atlasdatafederation/datafederation_controller.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" "go.mongodb.org/atlas/mongodbatlas" @@ -22,14 +22,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 diff --git a/pkg/controller/atlasdatafederation/private_endpoint.go b/pkg/controller/atlasdatafederation/private_endpoint.go index 44c75d63f6..a12f1b8675 100644 --- a/pkg/controller/atlasdatafederation/private_endpoint.go +++ b/pkg/controller/atlasdatafederation/private_endpoint.go @@ -3,10 +3,10 @@ package atlasdatafederation import ( "context" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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 { diff --git a/pkg/controller/atlasdeployment/advanced_deployment.go b/pkg/controller/atlasdeployment/advanced_deployment.go index e59f698836..92fa4d19f5 100644 --- a/pkg/controller/atlasdeployment/advanced_deployment.go +++ b/pkg/controller/atlasdeployment/advanced_deployment.go @@ -13,13 +13,13 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/stringutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + 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/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/stringutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) const FreeTier = "M0" diff --git a/pkg/controller/atlasdeployment/advanced_deployment_test.go b/pkg/controller/atlasdeployment/advanced_deployment_test.go index 1a5fcb7310..ffc45db1fd 100644 --- a/pkg/controller/atlasdeployment/advanced_deployment_test.go +++ b/pkg/controller/atlasdeployment/advanced_deployment_test.go @@ -5,15 +5,15 @@ import ( "go.uber.org/zap" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func TestMergedAdvancedDeployment(t *testing.T) { diff --git a/pkg/controller/atlasdeployment/atlasdeployment_controller.go b/pkg/controller/atlasdeployment/atlasdeployment_controller.go index 8b6584c197..935af3cada 100644 --- a/pkg/controller/atlasdeployment/atlasdeployment_controller.go +++ b/pkg/controller/atlasdeployment/atlasdeployment_controller.go @@ -39,18 +39,18 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/validate" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "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/validate" + "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/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) // AtlasDeploymentReconciler reconciles an AtlasDeployment object diff --git a/pkg/controller/atlasdeployment/atlasdeployment_controller_test.go b/pkg/controller/atlasdeployment/atlasdeployment_controller_test.go index 84a255c40e..7ea0bfa178 100644 --- a/pkg/controller/atlasdeployment/atlasdeployment_controller_test.go +++ b/pkg/controller/atlasdeployment/atlasdeployment_controller_test.go @@ -36,15 +36,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + v1 "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/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/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) const ( diff --git a/pkg/controller/atlasdeployment/backup.go b/pkg/controller/atlasdeployment/backup.go index 4121b996c2..901fad363a 100644 --- a/pkg/controller/atlasdeployment/backup.go +++ b/pkg/controller/atlasdeployment/backup.go @@ -6,25 +6,25 @@ import ( "fmt" "net/http" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/validate" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/validate" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "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/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" "go.mongodb.org/atlas/mongodbatlas" "golang.org/x/sync/errgroup" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) var errArgIsNotBackupSchedule = errors.New("failed to match resource type as AtlasBackupSchedule") diff --git a/pkg/controller/atlasdeployment/backup_test.go b/pkg/controller/atlasdeployment/backup_test.go index 57dc19aa85..2e05b7cc71 100644 --- a/pkg/controller/atlasdeployment/backup_test.go +++ b/pkg/controller/atlasdeployment/backup_test.go @@ -8,12 +8,12 @@ import ( "go.mongodb.org/atlas/mongodbatlas" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) const ( diff --git a/pkg/controller/atlasdeployment/customzonemapping.go b/pkg/controller/atlasdeployment/customzonemapping.go index 8f16452a19..b402ad111b 100644 --- a/pkg/controller/atlasdeployment/customzonemapping.go +++ b/pkg/controller/atlasdeployment/customzonemapping.go @@ -6,9 +6,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + 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" ) func EnsureCustomZoneMapping(service *workflow.Context, groupID string, customZoneMappings []mdbv1.CustomZoneMapping, deploymentName string) workflow.Result { diff --git a/pkg/controller/atlasdeployment/customzonemapping_test.go b/pkg/controller/atlasdeployment/customzonemapping_test.go index 9fa1f07e18..81b5e8beed 100644 --- a/pkg/controller/atlasdeployment/customzonemapping_test.go +++ b/pkg/controller/atlasdeployment/customzonemapping_test.go @@ -3,7 +3,7 @@ package atlasdeployment import ( "testing" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) type CMZTestData struct { diff --git a/pkg/controller/atlasdeployment/deployment_test.go b/pkg/controller/atlasdeployment/deployment_test.go index 4d0514bc74..11c90c64cd 100644 --- a/pkg/controller/atlasdeployment/deployment_test.go +++ b/pkg/controller/atlasdeployment/deployment_test.go @@ -3,9 +3,9 @@ package atlasdeployment import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + v1 "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/util/toptr" ) func CreateBasicDeployment(name string) *v1.AtlasDeployment { diff --git a/pkg/controller/atlasdeployment/managed_namespaces.go b/pkg/controller/atlasdeployment/managed_namespaces.go index 12a099a194..aa36e8228a 100644 --- a/pkg/controller/atlasdeployment/managed_namespaces.go +++ b/pkg/controller/atlasdeployment/managed_namespaces.go @@ -6,10 +6,10 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util" + 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" ) func EnsureManagedNamespaces(service *workflow.Context, groupID string, clusterType string, managedNamespace []mdbv1.ManagedNamespace, deploymentName string) workflow.Result { diff --git a/pkg/controller/atlasdeployment/region_configuration.go b/pkg/controller/atlasdeployment/region_configuration.go index 9436253d48..78b5e7bdf7 100644 --- a/pkg/controller/atlasdeployment/region_configuration.go +++ b/pkg/controller/atlasdeployment/region_configuration.go @@ -1,13 +1,13 @@ package atlasdeployment import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" "github.com/google/go-cmp/cmp" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func syncRegionConfiguration(deploymentSpec *mdbv1.AdvancedDeploymentSpec, atlasCluster *mongodbatlas.AdvancedCluster) { diff --git a/pkg/controller/atlasdeployment/region_configuration_test.go b/pkg/controller/atlasdeployment/region_configuration_test.go index 09d8778bfe..cc3bb19075 100644 --- a/pkg/controller/atlasdeployment/region_configuration_test.go +++ b/pkg/controller/atlasdeployment/region_configuration_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestSyncComputeConfiguration(t *testing.T) { diff --git a/pkg/controller/atlasdeployment/serverless_deployment.go b/pkg/controller/atlasdeployment/serverless_deployment.go index 3d00cc624a..6d4bb95034 100644 --- a/pkg/controller/atlasdeployment/serverless_deployment.go +++ b/pkg/controller/atlasdeployment/serverless_deployment.go @@ -5,12 +5,12 @@ import ( "fmt" "net/http" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func (r *AtlasDeploymentReconciler) ensureServerlessInstanceState(workflowCtx *workflow.Context, project *mdbv1.AtlasProject, deployment *mdbv1.AtlasDeployment) (atlasDeployment *mongodbatlas.Cluster, _ workflow.Result) { diff --git a/pkg/controller/atlasdeployment/serverless_private_endpoint.go b/pkg/controller/atlasdeployment/serverless_private_endpoint.go index 03ec946f5d..bb1f133f18 100644 --- a/pkg/controller/atlasdeployment/serverless_private_endpoint.go +++ b/pkg/controller/atlasdeployment/serverless_private_endpoint.go @@ -6,18 +6,18 @@ import ( "fmt" "sort" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/stringutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/stringutil" "go.uber.org/zap" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) const ( diff --git a/pkg/controller/atlasdeployment/serverless_private_endpoint_test.go b/pkg/controller/atlasdeployment/serverless_private_endpoint_test.go index ced58f6c40..8ab088f993 100644 --- a/pkg/controller/atlasdeployment/serverless_private_endpoint_test.go +++ b/pkg/controller/atlasdeployment/serverless_private_endpoint_test.go @@ -11,9 +11,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) const ( diff --git a/pkg/controller/atlasfederatedauth/atlasfederated_auth.go b/pkg/controller/atlasfederatedauth/atlasfederated_auth.go index 4ca7948b1e..c589355a20 100644 --- a/pkg/controller/atlasfederatedauth/atlasfederated_auth.go +++ b/pkg/controller/atlasfederatedauth/atlasfederated_auth.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-cmp/cmp" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func (r *AtlasFederatedAuthReconciler) ensureFederatedAuth(service *workflow.Context, fedauth *mdbv1.AtlasFederatedAuth) workflow.Result { diff --git a/pkg/controller/atlasfederatedauth/atlasfederated_auth_controller.go b/pkg/controller/atlasfederatedauth/atlasfederated_auth_controller.go index 5cd8fbe0e7..6169e43c21 100644 --- a/pkg/controller/atlasfederatedauth/atlasfederated_auth_controller.go +++ b/pkg/controller/atlasfederatedauth/atlasfederated_auth_controller.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/statushandler" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" @@ -17,17 +17,17 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "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/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ctrl "sigs.k8s.io/controller-runtime" corev1 "k8s.io/api/core/v1" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) // AtlasFederatedAuthReconciler reconciles an AtlasFederatedAuth object diff --git a/pkg/controller/atlasproject/alert_configurations.go b/pkg/controller/atlasproject/alert_configurations.go index 4fde0ec29e..ea8ff09566 100644 --- a/pkg/controller/atlasproject/alert_configurations.go +++ b/pkg/controller/atlasproject/alert_configurations.go @@ -10,11 +10,11 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + 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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func (r *AtlasProjectReconciler) ensureAlertConfigurations(service *workflow.Context, project *mdbv1.AtlasProject) workflow.Result { diff --git a/pkg/controller/atlasproject/atlasproject_controller.go b/pkg/controller/atlasproject/atlasproject_controller.go index 78dc407844..63b33a1e28 100644 --- a/pkg/controller/atlasproject/atlasproject_controller.go +++ b/pkg/controller/atlasproject/atlasproject_controller.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/builder" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/validate" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/validate" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" @@ -36,15 +36,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/source" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/authmode" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/authmode" + "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" ) // AtlasProjectReconciler reconciles a AtlasProject object diff --git a/pkg/controller/atlasproject/auditing.go b/pkg/controller/atlasproject/auditing.go index 5aed837e17..8c884dcb68 100644 --- a/pkg/controller/atlasproject/auditing.go +++ b/pkg/controller/atlasproject/auditing.go @@ -6,14 +6,14 @@ import ( "fmt" "reflect" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" "go.mongodb.org/atlas/mongodbatlas" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + v1 "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/toptr" ) func ensureAuditing(workflowCtx *workflow.Context, project *v1.AtlasProject, protected bool) workflow.Result { diff --git a/pkg/controller/atlasproject/auditing_test.go b/pkg/controller/atlasproject/auditing_test.go index 98a6b92ec5..72a8eb4e72 100644 --- a/pkg/controller/atlasproject/auditing_test.go +++ b/pkg/controller/atlasproject/auditing_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestCanAuditingReconcile(t *testing.T) { diff --git a/pkg/controller/atlasproject/cloud_provider_access.go b/pkg/controller/atlasproject/cloud_provider_access.go index 36752c2f7a..a756b4576f 100644 --- a/pkg/controller/atlasproject/cloud_provider_access.go +++ b/pkg/controller/atlasproject/cloud_provider_access.go @@ -6,14 +6,14 @@ import ( "fmt" "sort" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/set" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/set" "go.mongodb.org/atlas/mongodbatlas" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + v1 "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" ) func ensureProviderAccessStatus(workflowCtx *workflow.Context, project *v1.AtlasProject, protected bool) workflow.Result { diff --git a/pkg/controller/atlasproject/cloud_provider_access_test.go b/pkg/controller/atlasproject/cloud_provider_access_test.go index 38f9dd2c49..92310b7b86 100644 --- a/pkg/controller/atlasproject/cloud_provider_access_test.go +++ b/pkg/controller/atlasproject/cloud_provider_access_test.go @@ -9,11 +9,11 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap/zaptest" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func TestSyncCloudProviderAccess(t *testing.T) { diff --git a/pkg/controller/atlasproject/custom_roles.go b/pkg/controller/atlasproject/custom_roles.go index 47e4ff4f8c..b14b08d5b8 100644 --- a/pkg/controller/atlasproject/custom_roles.go +++ b/pkg/controller/atlasproject/custom_roles.go @@ -6,15 +6,15 @@ import ( "errors" "fmt" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func ensureCustomRoles(workflowCtx *workflow.Context, project *v1.AtlasProject, protected bool) workflow.Result { diff --git a/pkg/controller/atlasproject/custom_roles_test.go b/pkg/controller/atlasproject/custom_roles_test.go index 0a05ac566a..a52517ba02 100644 --- a/pkg/controller/atlasproject/custom_roles_test.go +++ b/pkg/controller/atlasproject/custom_roles_test.go @@ -10,12 +10,12 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestCalculateChanges(t *testing.T) { diff --git a/pkg/controller/atlasproject/encryption_at_rest.go b/pkg/controller/atlasproject/encryption_at_rest.go index 2538795ef6..3a39bdcafa 100644 --- a/pkg/controller/atlasproject/encryption_at_rest.go +++ b/pkg/controller/atlasproject/encryption_at_rest.go @@ -8,17 +8,17 @@ import ( "regexp" "strings" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + 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/api/v1/status" + "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/toptr" "go.mongodb.org/atlas/mongodbatlas" ) diff --git a/pkg/controller/atlasproject/encryption_at_rest_test.go b/pkg/controller/atlasproject/encryption_at_rest_test.go index 0ce186b98f..eeb7d44fbf 100644 --- a/pkg/controller/atlasproject/encryption_at_rest_test.go +++ b/pkg/controller/atlasproject/encryption_at_rest_test.go @@ -13,12 +13,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestCanEncryptionAtRestReconcile(t *testing.T) { diff --git a/pkg/controller/atlasproject/integrations.go b/pkg/controller/atlasproject/integrations.go index 38f30ace58..dcb0ef5555 100644 --- a/pkg/controller/atlasproject/integrations.go +++ b/pkg/controller/atlasproject/integrations.go @@ -8,16 +8,16 @@ import ( "net/url" "reflect" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/set" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/set" ) func (r *AtlasProjectReconciler) ensureIntegration(workflowCtx *workflow.Context, akoProject *mdbv1.AtlasProject, protected bool) workflow.Result { diff --git a/pkg/controller/atlasproject/integrations_test.go b/pkg/controller/atlasproject/integrations_test.go index 4388e15809..f0f3f9f840 100644 --- a/pkg/controller/atlasproject/integrations_test.go +++ b/pkg/controller/atlasproject/integrations_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func TestToAlias(t *testing.T) { diff --git a/pkg/controller/atlasproject/ipaccess_list.go b/pkg/controller/atlasproject/ipaccess_list.go index 9e834d9921..d3f285a580 100644 --- a/pkg/controller/atlasproject/ipaccess_list.go +++ b/pkg/controller/atlasproject/ipaccess_list.go @@ -8,20 +8,20 @@ import ( "strings" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/timeutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/timeutil" ) const ipAccessStatusPending = "PENDING" diff --git a/pkg/controller/atlasproject/ipaccess_list_test.go b/pkg/controller/atlasproject/ipaccess_list_test.go index 1a514ef36f..a39621ed5c 100644 --- a/pkg/controller/atlasproject/ipaccess_list_test.go +++ b/pkg/controller/atlasproject/ipaccess_list_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" + "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/workflow" ) func TestFilterActiveIPAccessLists(t *testing.T) { diff --git a/pkg/controller/atlasproject/maintenancewindow.go b/pkg/controller/atlasproject/maintenancewindow.go index 77d380d19c..1295e0445e 100644 --- a/pkg/controller/atlasproject/maintenancewindow.go +++ b/pkg/controller/atlasproject/maintenancewindow.go @@ -6,16 +6,16 @@ import ( "errors" "fmt" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/workflow" ) // ensureMaintenanceWindow ensures that the state of the Atlas Maintenance Window matches the diff --git a/pkg/controller/atlasproject/maintenancewindow_test.go b/pkg/controller/atlasproject/maintenancewindow_test.go index 3bf5db4bd5..d2a0f426a6 100644 --- a/pkg/controller/atlasproject/maintenancewindow_test.go +++ b/pkg/controller/atlasproject/maintenancewindow_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestValidateMaintenanceWindow(t *testing.T) { diff --git a/pkg/controller/atlasproject/network_peering.go b/pkg/controller/atlasproject/network_peering.go index 0767db2cd9..99a4a87f98 100644 --- a/pkg/controller/atlasproject/network_peering.go +++ b/pkg/controller/atlasproject/network_peering.go @@ -7,16 +7,16 @@ import ( "net/http" "strings" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util" ) const ( diff --git a/pkg/controller/atlasproject/network_peering_test.go b/pkg/controller/atlasproject/network_peering_test.go index e601e5f029..2aa28b26b9 100644 --- a/pkg/controller/atlasproject/network_peering_test.go +++ b/pkg/controller/atlasproject/network_peering_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func TestCanNetworkPeeringReconcile(t *testing.T) { diff --git a/pkg/controller/atlasproject/private_endpoint.go b/pkg/controller/atlasproject/private_endpoint.go index efe70f45d5..ef848552eb 100644 --- a/pkg/controller/atlasproject/private_endpoint.go +++ b/pkg/controller/atlasproject/private_endpoint.go @@ -7,17 +7,17 @@ import ( "fmt" "net/http" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" "golang.org/x/exp/slices" "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/set" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/set" ) func ensurePrivateEndpoint(workflowCtx *workflow.Context, project *mdbv1.AtlasProject, protected bool) workflow.Result { diff --git a/pkg/controller/atlasproject/private_endpoint_test.go b/pkg/controller/atlasproject/private_endpoint_test.go index 21218091df..cad6b0caa5 100644 --- a/pkg/controller/atlasproject/private_endpoint_test.go +++ b/pkg/controller/atlasproject/private_endpoint_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func TestGetEndpointsNotInAtlas(t *testing.T) { diff --git a/pkg/controller/atlasproject/project.go b/pkg/controller/atlasproject/project.go index 0c53cd6381..627b30799a 100644 --- a/pkg/controller/atlasproject/project.go +++ b/pkg/controller/atlasproject/project.go @@ -6,9 +6,9 @@ import ( "go.mongodb.org/atlas/mongodbatlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) // ensureProjectExists creates the project if it doesn't exist yet. Returns the project ID diff --git a/pkg/controller/atlasproject/project_settings.go b/pkg/controller/atlasproject/project_settings.go index 1946959487..dee6af4b7b 100644 --- a/pkg/controller/atlasproject/project_settings.go +++ b/pkg/controller/atlasproject/project_settings.go @@ -6,15 +6,15 @@ import ( "fmt" "reflect" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + v1 "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" ) func ensureProjectSettings(workflowCtx *workflow.Context, project *v1.AtlasProject, protected bool) (result workflow.Result) { diff --git a/pkg/controller/atlasproject/project_settings_test.go b/pkg/controller/atlasproject/project_settings_test.go index f319926788..f474f8c3c1 100644 --- a/pkg/controller/atlasproject/project_settings_test.go +++ b/pkg/controller/atlasproject/project_settings_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) func TestProjectSettingsReconcile(t *testing.T) { diff --git a/pkg/controller/atlasproject/team_reconciler.go b/pkg/controller/atlasproject/team_reconciler.go index 918d6cf5e0..47c6cd1c5b 100644 --- a/pkg/controller/atlasproject/team_reconciler.go +++ b/pkg/controller/atlasproject/team_reconciler.go @@ -7,7 +7,7 @@ import ( "net/http" "sync" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "go.mongodb.org/atlas/mongodbatlas" "go.uber.org/zap" @@ -17,11 +17,11 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "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/workflow" ) func (r *AtlasProjectReconciler) teamReconcile( diff --git a/pkg/controller/atlasproject/team_reconciler_test.go b/pkg/controller/atlasproject/team_reconciler_test.go index 4604473f30..12eed26a65 100644 --- a/pkg/controller/atlasproject/team_reconciler_test.go +++ b/pkg/controller/atlasproject/team_reconciler_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "go.mongodb.org/atlas/mongodbatlas" - atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + atlas_mock "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + v1 "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/workflow" ) func TestTeamManagedByAtlas(t *testing.T) { diff --git a/pkg/controller/atlasproject/teams.go b/pkg/controller/atlasproject/teams.go index e841a04ce4..b124f85fa2 100644 --- a/pkg/controller/atlasproject/teams.go +++ b/pkg/controller/atlasproject/teams.go @@ -8,7 +8,7 @@ import ( apiErrors "k8s.io/apimachinery/pkg/api/errors" controllerruntime "sigs.k8s.io/controller-runtime" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" @@ -16,13 +16,13 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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/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" ) type TeamDataContainer struct { diff --git a/pkg/controller/atlasproject/teams_test.go b/pkg/controller/atlasproject/teams_test.go index 7b49086bba..428e2cbe11 100644 --- a/pkg/controller/atlasproject/teams_test.go +++ b/pkg/controller/atlasproject/teams_test.go @@ -14,12 +14,12 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/mongodb/mongodb-atlas-kubernetes/internal/mocks/atlas" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/internal/mocks/atlas" + 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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func TestCanAssignedTeamsReconcile(t *testing.T) { diff --git a/pkg/controller/atlasproject/x509_auth.go b/pkg/controller/atlasproject/x509_auth.go index 6c80c991b0..e1d1106a42 100644 --- a/pkg/controller/atlasproject/x509_auth.go +++ b/pkg/controller/atlasproject/x509_auth.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/authmode" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/authmode" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" ) func (r *AtlasProjectReconciler) ensureX509(ctx *workflow.Context, projectID string, project *mdbv1.AtlasProject) (authmode.AuthModes, workflow.Result) { diff --git a/pkg/controller/connectionsecret/connectionsecrets.go b/pkg/controller/connectionsecret/connectionsecrets.go index 11384339db..3fdc5b9fec 100644 --- a/pkg/controller/connectionsecret/connectionsecrets.go +++ b/pkg/controller/connectionsecret/connectionsecrets.go @@ -10,10 +10,10 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/stringutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/stringutil" ) const ConnectionSecretsEnsuredEvent = "ConnectionSecretsEnsured" diff --git a/pkg/controller/connectionsecret/ensuresecret.go b/pkg/controller/connectionsecret/ensuresecret.go index b6c73bb72d..ddca8e3121 100644 --- a/pkg/controller/connectionsecret/ensuresecret.go +++ b/pkg/controller/connectionsecret/ensuresecret.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) const ( diff --git a/pkg/controller/connectionsecret/ensuresecret_test.go b/pkg/controller/connectionsecret/ensuresecret_test.go index de0fbc262b..a8460004fc 100644 --- a/pkg/controller/connectionsecret/ensuresecret_test.go +++ b/pkg/controller/connectionsecret/ensuresecret_test.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) func TestAddCredentialsToConnectionURL(t *testing.T) { diff --git a/pkg/controller/connectionsecret/listsecrets.go b/pkg/controller/connectionsecret/listsecrets.go index 70b21d9245..a3f9179873 100644 --- a/pkg/controller/connectionsecret/listsecrets.go +++ b/pkg/controller/connectionsecret/listsecrets.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) // ListByDeploymentName returns all secrets in the specified namespace that have labels for 'projectID' and 'clusterName' diff --git a/pkg/controller/connectionsecret/listsecrets_test.go b/pkg/controller/connectionsecret/listsecrets_test.go index 50614c0819..bab32488e0 100644 --- a/pkg/controller/connectionsecret/listsecrets_test.go +++ b/pkg/controller/connectionsecret/listsecrets_test.go @@ -9,7 +9,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func TestListConnectionSecrets(t *testing.T) { diff --git a/pkg/controller/customresource/customresource.go b/pkg/controller/customresource/customresource.go index 07fcfab7ac..e3ea5d3ede 100644 --- a/pkg/controller/customresource/customresource.go +++ b/pkg/controller/customresource/customresource.go @@ -14,11 +14,11 @@ import ( "github.com/Masterminds/semver" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/statushandler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + 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/statushandler" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" ) const ( diff --git a/pkg/controller/customresource/customresource_test.go b/pkg/controller/customresource/customresource_test.go index 437811c61b..d5ae6719ff 100644 --- a/pkg/controller/customresource/customresource_test.go +++ b/pkg/controller/customresource/customresource_test.go @@ -4,13 +4,13 @@ import ( "fmt" "testing" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func TestResourceShouldBeLeftInAtlas(t *testing.T) { diff --git a/pkg/controller/customresource/finalizer.go b/pkg/controller/customresource/finalizer.go index 1da0058410..5caa97e2c3 100644 --- a/pkg/controller/customresource/finalizer.go +++ b/pkg/controller/customresource/finalizer.go @@ -6,8 +6,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) const FinalizerLabel = "mongodbatlas/finalizer" diff --git a/pkg/controller/customresource/protection.go b/pkg/controller/customresource/protection.go index a0a7f264e6..02efde78c6 100644 --- a/pkg/controller/customresource/protection.go +++ b/pkg/controller/customresource/protection.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) const ( diff --git a/pkg/controller/customresource/protection_test.go b/pkg/controller/customresource/protection_test.go index 826396aa8c..015699fa25 100644 --- a/pkg/controller/customresource/protection_test.go +++ b/pkg/controller/customresource/protection_test.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" ) func sampleResource() *mdbv1.AtlasDatabaseUser { diff --git a/pkg/controller/statushandler/handler.go b/pkg/controller/statushandler/handler.go index 718b5825a8..ec003d688d 100644 --- a/pkg/controller/statushandler/handler.go +++ b/pkg/controller/statushandler/handler.go @@ -5,9 +5,9 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) // Update performs the update (in the form of patch) for the Atlas Custom Resource status. diff --git a/pkg/controller/statushandler/patch.go b/pkg/controller/statushandler/patch.go index 1fd128d53b..deebf87676 100644 --- a/pkg/controller/statushandler/patch.go +++ b/pkg/controller/statushandler/patch.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) type patchValue struct { diff --git a/pkg/controller/statushandler/patch_test.go b/pkg/controller/statushandler/patch_test.go index d084cebdf5..8b94441744 100644 --- a/pkg/controller/statushandler/patch_test.go +++ b/pkg/controller/statushandler/patch_test.go @@ -11,9 +11,9 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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" ) func Test_PatchUpdateStatus(t *testing.T) { diff --git a/pkg/controller/validate/validate.go b/pkg/controller/validate/validate.go index ab5cc12f51..cb5bde14c9 100644 --- a/pkg/controller/validate/validate.go +++ b/pkg/controller/validate/validate.go @@ -7,14 +7,14 @@ import ( "reflect" "regexp" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/timeutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/timeutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func DeploymentSpec(deploymentSpec *mdbv1.AtlasDeploymentSpec, isGov bool, regionUsageRestrictions string) error { diff --git a/pkg/controller/validate/validate_test.go b/pkg/controller/validate/validate_test.go index 6c91a69038..10ecf9c4c8 100644 --- a/pkg/controller/validate/validate_test.go +++ b/pkg/controller/validate/validate_test.go @@ -3,15 +3,15 @@ package validate import ( "testing" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" "github.com/stretchr/testify/assert" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func TestClusterValidation(t *testing.T) { diff --git a/pkg/controller/watch/event_handler.go b/pkg/controller/watch/event_handler.go index 805827bba0..8d7400189e 100644 --- a/pkg/controller/watch/event_handler.go +++ b/pkg/controller/watch/event_handler.go @@ -7,7 +7,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) // EventHandlerWithDelete is an extension of EnqueueRequestForObject that will _not_ trigger a reconciliation for a Delete event. diff --git a/pkg/controller/watch/resource_watcher_test.go b/pkg/controller/watch/resource_watcher_test.go index d8da9dc5e6..52475536a3 100644 --- a/pkg/controller/watch/resource_watcher_test.go +++ b/pkg/controller/watch/resource_watcher_test.go @@ -7,7 +7,7 @@ import ( "go.uber.org/zap" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) func TestEnsureResourcesAreWatched(t *testing.T) { diff --git a/pkg/controller/watch/watched_resource_handler.go b/pkg/controller/watch/watched_resource_handler.go index e66ce804b0..7049c8b4a9 100644 --- a/pkg/controller/watch/watched_resource_handler.go +++ b/pkg/controller/watch/watched_resource_handler.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" diff --git a/pkg/controller/watch/watched_resource_handler_test.go b/pkg/controller/watch/watched_resource_handler_test.go index 43f6aa0fc2..31470891d3 100644 --- a/pkg/controller/watch/watched_resource_handler_test.go +++ b/pkg/controller/watch/watched_resource_handler_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" ) func TestHandleCreate(t *testing.T) { diff --git a/pkg/controller/workflow/context.go b/pkg/controller/workflow/context.go index ce63b18623..3ce2757841 100644 --- a/pkg/controller/workflow/context.go +++ b/pkg/controller/workflow/context.go @@ -7,9 +7,9 @@ import ( "go.uber.org/zap" corev1 "k8s.io/api/core/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" + "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/watch" ) // Context is a container for some information that is needed on all levels of function calls during reconciliation. diff --git a/pkg/controller/workflow/status.go b/pkg/controller/workflow/status.go index 0268a577a6..ac67b5222d 100644 --- a/pkg/controller/workflow/status.go +++ b/pkg/controller/workflow/status.go @@ -1,7 +1,7 @@ package workflow import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) // Status is a mutable container containing the status of some particular reconciliation. It is expected to be updated diff --git a/pkg/controller/workflow/status_test.go b/pkg/controller/workflow/status_test.go index bfa69b30c4..23c187e0c7 100644 --- a/pkg/controller/workflow/status_test.go +++ b/pkg/controller/workflow/status_test.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) func Test_EnsureCondition(t *testing.T) { diff --git a/pkg/util/compat/json_slice_merge_test.go b/pkg/util/compat/json_slice_merge_test.go index 3892de7b37..8dd1a0596e 100644 --- a/pkg/util/compat/json_slice_merge_test.go +++ b/pkg/util/compat/json_slice_merge_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - . "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + . "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" ) func TestJSONSliceMerge(t *testing.T) { diff --git a/pkg/util/compat/jsoncopy_test.go b/pkg/util/compat/jsoncopy_test.go index db1dad74af..136d0065b9 100644 --- a/pkg/util/compat/jsoncopy_test.go +++ b/pkg/util/compat/jsoncopy_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - . "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + . "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" ) // JSONCopy will copy src to dst via JSON serialization/deserialization. diff --git a/pkg/util/testutil/conditions.go b/pkg/util/testutil/conditions.go index 17d820d355..a10deb9fc9 100644 --- a/pkg/util/testutil/conditions.go +++ b/pkg/util/testutil/conditions.go @@ -5,7 +5,7 @@ import ( "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) // MatchCondition returns the GomegaMatcher that checks if the 'actual' status.Condition matches the 'expected' one. diff --git a/pkg/util/testutil/customresources.go b/pkg/util/testutil/customresources.go index dc995a6629..5194e4d2b0 100644 --- a/pkg/util/testutil/customresources.go +++ b/pkg/util/testutil/customresources.go @@ -8,9 +8,9 @@ import ( apiErrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/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" ) func CheckCondition(k8sClient client.Client, createdResource mdbv1.AtlasCustomResource, expectedCondition status.Condition, checksIfFail ...func(mdbv1.AtlasCustomResource)) bool { diff --git a/pkg/util/testutil/events.go b/pkg/util/testutil/events.go index 83013ee582..28e7fa9422 100644 --- a/pkg/util/testutil/events.go +++ b/pkg/util/testutil/events.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) func EventExists(k8sClient client.Client, createdResource mdbv1.AtlasCustomResource, expectedType, expectedReason, expectedMessageRegexp string) { diff --git a/pkg/util/testutil/ipaccesslist_matcher.go b/pkg/util/testutil/ipaccesslist_matcher.go index c3ae69ebd0..4b4e9d854a 100644 --- a/pkg/util/testutil/ipaccesslist_matcher.go +++ b/pkg/util/testutil/ipaccesslist_matcher.go @@ -5,8 +5,8 @@ import ( "github.com/onsi/gomega/types" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/timeutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/timeutil" ) // MatchIPAccessList returns the GomegaMatcher that checks if the 'actual' mongodbatlas.ProjectIPAccessList matches diff --git a/pkg/util/testutil/maintenancewindow_matcher.go b/pkg/util/testutil/maintenancewindow_matcher.go index 43360f7276..10650428a8 100644 --- a/pkg/util/testutil/maintenancewindow_matcher.go +++ b/pkg/util/testutil/maintenancewindow_matcher.go @@ -8,7 +8,7 @@ import ( "github.com/onsi/gomega/types" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) // MatchMaintenanceWindow returns the GomegaMatcher that checks if the 'actual' mongodbatlas.MaintenanceWindow matches diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go index a5056b60e7..b435983497 100644 --- a/pkg/version/version_test.go +++ b/pkg/version/version_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" ) func TestReleaseVersion(t *testing.T) { diff --git a/scripts/create_x509.go b/scripts/create_x509.go index f297efd853..34c1760f65 100644 --- a/scripts/create_x509.go +++ b/scripts/create_x509.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) func main() { diff --git a/test/e2e/actions/actions.go b/test/e2e/actions/actions.go index 67c44ac99e..c5f8b35e82 100644 --- a/test/e2e/actions/actions.go +++ b/test/e2e/actions/actions.go @@ -6,18 +6,18 @@ import ( "fmt" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func UpdateSpecOfSelectedDeployment(spec v1.AtlasDeploymentSpec, indexOfDeployment int) func(data *model.TestDataProvider) { diff --git a/test/e2e/actions/annotations_related.go b/test/e2e/actions/annotations_related.go index 9cb5430c0a..86e4f0a7c4 100644 --- a/test/e2e/actions/annotations_related.go +++ b/test/e2e/actions/annotations_related.go @@ -4,22 +4,22 @@ import ( "fmt" "time" - kubecli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" + kubecli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func DeleteDeploymentCRWithKeepAnnotation(testData *model.TestDataProvider) { diff --git a/test/e2e/actions/cloud/aws.go b/test/e2e/actions/cloud/aws.go index 0e462b1f72..b8263b8afc 100644 --- a/test/e2e/actions/cloud/aws.go +++ b/test/e2e/actions/cloud/aws.go @@ -15,7 +15,7 @@ import ( "github.com/aws/aws-sdk-go/service/sts" "github.com/onsi/ginkgo/v2/dsl/core" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) type AwsAction struct { diff --git a/test/e2e/actions/cloud/azure.go b/test/e2e/actions/cloud/azure.go index 2791d2b02d..ce9de63c9b 100644 --- a/test/e2e/actions/cloud/azure.go +++ b/test/e2e/actions/cloud/azure.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/onsi/ginkgo/v2/dsl/core" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) const ( diff --git a/test/e2e/actions/cloud/gcp.go b/test/e2e/actions/cloud/gcp.go index 06e8776c77..4ad57f8c5d 100644 --- a/test/e2e/actions/cloud/gcp.go +++ b/test/e2e/actions/cloud/gcp.go @@ -14,7 +14,7 @@ import ( "github.com/onsi/ginkgo/v2/dsl/core" "k8s.io/apimachinery/pkg/util/rand" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" compute "cloud.google.com/go/compute/apiv1" "cloud.google.com/go/compute/apiv1/computepb" diff --git a/test/e2e/actions/cloud/provider.go b/test/e2e/actions/cloud/provider.go index d2d9824e87..b905a50bf9 100644 --- a/test/e2e/actions/cloud/provider.go +++ b/test/e2e/actions/cloud/provider.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2" "github.com/onsi/ginkgo/v2/dsl/core" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" ) const ( diff --git a/test/e2e/actions/cloudaccess/roles.go b/test/e2e/actions/cloudaccess/roles.go index d97deccdd0..e100247921 100644 --- a/test/e2e/actions/cloudaccess/roles.go +++ b/test/e2e/actions/cloudaccess/roles.go @@ -3,9 +3,9 @@ package cloudaccess import ( "fmt" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" ) type Role struct { diff --git a/test/e2e/actions/conditions.go b/test/e2e/actions/conditions.go index 33dcf5f4ed..0734588445 100644 --- a/test/e2e/actions/conditions.go +++ b/test/e2e/actions/conditions.go @@ -8,9 +8,9 @@ import ( "github.com/onsi/gomega/types" v1 "k8s.io/api/core/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func WaitForConditionsToBecomeTrue(userData *model.TestDataProvider, conditionTypes ...status.ConditionType) { diff --git a/test/e2e/actions/deploy/deploy_operator.go b/test/e2e/actions/deploy/deploy_operator.go index 58f5dd0064..2109e6f6b4 100644 --- a/test/e2e/actions/deploy/deploy_operator.go +++ b/test/e2e/actions/deploy/deploy_operator.go @@ -12,14 +12,14 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/fixtest" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/fixtest" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) func MultiNamespaceOperator(data *model.TestDataProvider, watchNamespace []string) { diff --git a/test/e2e/actions/helm_related.go b/test/e2e/actions/helm_related.go index fd8d59791d..3176d52714 100644 --- a/test/e2e/actions/helm_related.go +++ b/test/e2e/actions/helm_related.go @@ -4,15 +4,15 @@ import ( "fmt" "time" - kubecli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" + kubecli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - helm "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli/helm" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + helm "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli/helm" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) // helm update should change at least 1 field: databaseusers, project, deployment diff --git a/test/e2e/actions/kube/resources.go b/test/e2e/actions/kube/resources.go index 47ffb64360..9a0a8ad512 100644 --- a/test/e2e/actions/kube/resources.go +++ b/test/e2e/actions/kube/resources.go @@ -3,8 +3,8 @@ package kube import ( "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func GetProjectResource(data *model.TestDataProvider) (v1.AtlasProject, error) { diff --git a/test/e2e/actions/kube/statuses.go b/test/e2e/actions/kube/statuses.go index 3eb5519504..31cf0de8a7 100644 --- a/test/e2e/actions/kube/statuses.go +++ b/test/e2e/actions/kube/statuses.go @@ -5,10 +5,10 @@ import ( "k8s.io/apimachinery/pkg/types" - kubecli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" + kubecli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func ProjectReadyCondition(data *model.TestDataProvider) string { diff --git a/test/e2e/actions/project_flow.go b/test/e2e/actions/project_flow.go index 32ada2f646..f9acfffd3c 100644 --- a/test/e2e/actions/project_flow.go +++ b/test/e2e/actions/project_flow.go @@ -7,20 +7,20 @@ import ( "k8s.io/apimachinery/pkg/types" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) func ProjectCreationFlow(userData *model.TestDataProvider) { diff --git a/test/e2e/actions/steps.go b/test/e2e/actions/steps.go index 2a5a78ea9a..754d62270c 100644 --- a/test/e2e/actions/steps.go +++ b/test/e2e/actions/steps.go @@ -14,17 +14,17 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - kube "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - appclient "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/appclient" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli/helm" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + kube "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + appclient "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/appclient" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli/helm" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) func WaitDeployment(data *model.TestDataProvider, generation int) { diff --git a/test/e2e/alert_config_test.go b/test/e2e/alert_config_test.go index 70e54deeb6..8137b3835a 100644 --- a/test/e2e/alert_config_test.go +++ b/test/e2e/alert_config_test.go @@ -11,16 +11,16 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Alert configuration tests", Label("alert-config"), func() { diff --git a/test/e2e/annotations_test.go b/test/e2e/annotations_test.go index 84a71c92ea..2e4ba2db94 100644 --- a/test/e2e/annotations_test.go +++ b/test/e2e/annotations_test.go @@ -4,9 +4,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Annotations base test.", Label("deployment-annotations-ns"), func() { diff --git a/test/e2e/api/atlas/atlas.go b/test/e2e/api/atlas/atlas.go index f3157099fc..27b6601ca8 100644 --- a/test/e2e/api/atlas/atlas.go +++ b/test/e2e/api/atlas/atlas.go @@ -11,7 +11,7 @@ import ( "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils/debug" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils/debug" "github.com/mongodb-forks/digest" "go.mongodb.org/atlas/mongodbatlas" diff --git a/test/e2e/api/azure/azure.go b/test/e2e/api/azure/azure.go index 8579d4ba9d..7061e1c6f2 100644 --- a/test/e2e/api/azure/azure.go +++ b/test/e2e/api/azure/azure.go @@ -7,7 +7,7 @@ import ( "path" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" "github.com/Azure/azure-sdk-for-go/profiles/latest/network/mgmt/network" diff --git a/test/e2e/atlas_gov_test.go b/test/e2e/atlas_gov_test.go index 88c0cc1964..24c16f8eb9 100644 --- a/test/e2e/atlas_gov_test.go +++ b/test/e2e/atlas_gov_test.go @@ -15,19 +15,19 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloudaccess" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + 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/api/v1/project" + "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/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloudaccess" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Atlas for Government", Label("atlas-gov"), func() { diff --git a/test/e2e/auditing_test.go b/test/e2e/auditing_test.go index dc2281e6a3..0f5ebf67d9 100644 --- a/test/e2e/auditing_test.go +++ b/test/e2e/auditing_test.go @@ -4,11 +4,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("auditing"), func() { diff --git a/test/e2e/backup_config_test.go b/test/e2e/backup_config_test.go index 29c9f3ab4a..dded86f6f9 100644 --- a/test/e2e/backup_config_test.go +++ b/test/e2e/backup_config_test.go @@ -10,19 +10,19 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "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/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) const ( diff --git a/test/e2e/bundle_test.go b/test/e2e/bundle_test.go index 30d4a02606..d566617817 100644 --- a/test/e2e/bundle_test.go +++ b/test/e2e/bundle_test.go @@ -8,14 +8,14 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("User can deploy operator from bundles", func() { diff --git a/test/e2e/cli/helm/dependency.go b/test/e2e/cli/helm/dependency.go index 987801bdb4..3b038d5cb8 100644 --- a/test/e2e/cli/helm/dependency.go +++ b/test/e2e/cli/helm/dependency.go @@ -5,8 +5,8 @@ import ( "path/filepath" "regexp" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) // dependencyAsFile changes Chart dependency from 'repository' to 'file' diff --git a/test/e2e/cli/helm/helm.go b/test/e2e/cli/helm/helm.go index dcb2db1732..88b439583d 100644 --- a/test/e2e/cli/helm/helm.go +++ b/test/e2e/cli/helm/helm.go @@ -14,9 +14,9 @@ import ( "github.com/onsi/gomega/gexec" "gopkg.in/yaml.v3" - cli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + cli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) // GenKubeVersion diff --git a/test/e2e/cli/helm/prepare_value_file.go b/test/e2e/cli/helm/prepare_value_file.go index b780a9f7ad..661261ec05 100644 --- a/test/e2e/cli/helm/prepare_value_file.go +++ b/test/e2e/cli/helm/prepare_value_file.go @@ -3,8 +3,8 @@ package helm import ( "github.com/sethvargo/go-password/password" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) // Prepare chart values file for project, deployments, users https://github.com/mongodb/helm-charts/blob/main/charts/atlas-deployment/values.yaml diff --git a/test/e2e/cli/kustomize/kustomize.go b/test/e2e/cli/kustomize/kustomize.go index 51e3274da3..9ec9e13038 100644 --- a/test/e2e/cli/kustomize/kustomize.go +++ b/test/e2e/cli/kustomize/kustomize.go @@ -1,7 +1,7 @@ package kustomize import ( - cli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" + cli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" ) func Version() { diff --git a/test/e2e/cli/oc/oc.go b/test/e2e/cli/oc/oc.go index 7d351a59b7..054953ca98 100644 --- a/test/e2e/cli/oc/oc.go +++ b/test/e2e/cli/oc/oc.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" - cli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" + cli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" ) func Version() { diff --git a/test/e2e/cli/opm/opm.go b/test/e2e/cli/opm/opm.go index 1f18b0bd02..53b7a5dbfb 100644 --- a/test/e2e/cli/opm/opm.go +++ b/test/e2e/cli/opm/opm.go @@ -6,7 +6,7 @@ import ( "strings" - cli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" + cli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" ) // Version print version diff --git a/test/e2e/cli/podman/podman.go b/test/e2e/cli/podman/podman.go index af3ebc4f8a..daeb2d671e 100644 --- a/test/e2e/cli/podman/podman.go +++ b/test/e2e/cli/podman/podman.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" - cli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" + cli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" ) func Version() { diff --git a/test/e2e/cloud_access_role_test.go b/test/e2e/cloud_access_role_test.go index 797b08dc3c..bccc030b35 100644 --- a/test/e2e/cloud_access_role_test.go +++ b/test/e2e/cloud_access_role_test.go @@ -7,13 +7,13 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloudaccess" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloudaccess" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) const awsRoleNameBase = "atlas-operator-test-aws-role" diff --git a/test/e2e/configuration_test.go b/test/e2e/configuration_test.go index b0cb97a176..f6bf9a14e8 100644 --- a/test/e2e/configuration_test.go +++ b/test/e2e/configuration_test.go @@ -6,10 +6,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Configuration namespaced. Deploy deployment", Label("deployment-ns"), func() { diff --git a/test/e2e/custom_roles_test.go b/test/e2e/custom_roles_test.go index eb1c985e6d..00eec7e495 100644 --- a/test/e2e/custom_roles_test.go +++ b/test/e2e/custom_roles_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("custom-roles"), func() { diff --git a/test/e2e/data/deployments.go b/test/e2e/data/deployments.go index 9fb1542b2e..b9e49a0940 100644 --- a/test/e2e/data/deployments.go +++ b/test/e2e/data/deployments.go @@ -3,13 +3,13 @@ package data import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + v1 "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/customresource" ) const ( diff --git a/test/e2e/data/project.go b/test/e2e/data/project.go index d22d11d37a..ab0289cf45 100644 --- a/test/e2e/data/project.go +++ b/test/e2e/data/project.go @@ -3,10 +3,10 @@ package data import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) const ProjectName = "my-project" diff --git a/test/e2e/data/user.go b/test/e2e/data/user.go index fdf9d5a706..74e2cafac7 100644 --- a/test/e2e/data/user.go +++ b/test/e2e/data/user.go @@ -3,8 +3,8 @@ package data import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common" ) const ( diff --git a/test/e2e/datafederation_pe_test.go b/test/e2e/datafederation_pe_test.go index f526ef2566..fb03706a01 100644 --- a/test/e2e/datafederation_pe_test.go +++ b/test/e2e/datafederation_pe_test.go @@ -8,16 +8,16 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) // NOTES diff --git a/test/e2e/db_users_test.go b/test/e2e/db_users_test.go index 16809e1f96..a191109448 100644 --- a/test/e2e/db_users_test.go +++ b/test/e2e/db_users_test.go @@ -5,20 +5,20 @@ import ( "strings" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index f3066eea00..97919480e2 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -9,10 +9,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" ) const ( diff --git a/test/e2e/encryption_at_rest_test.go b/test/e2e/encryption_at_rest_test.go index 4c2e2d9338..5ab60310c8 100644 --- a/test/e2e/encryption_at_rest_test.go +++ b/test/e2e/encryption_at_rest_test.go @@ -14,19 +14,19 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloudaccess" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloudaccess" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) const ( diff --git a/test/e2e/free_tier_test.go b/test/e2e/free_tier_test.go index c60a14e42d..98079715ab 100644 --- a/test/e2e/free_tier_test.go +++ b/test/e2e/free_tier_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/gomega" "go.mongodb.org/atlas/mongodbatlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Free tier", Label("free-tier"), func() { diff --git a/test/e2e/global_deployment_test.go b/test/e2e/global_deployment_test.go index 9fbb645dc6..d996e2c45a 100644 --- a/test/e2e/global_deployment_test.go +++ b/test/e2e/global_deployment_test.go @@ -8,12 +8,12 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("global-deployment"), func() { diff --git a/test/e2e/helm_chart_test.go b/test/e2e/helm_chart_test.go index 2ddba96c24..5bdb587681 100644 --- a/test/e2e/helm_chart_test.go +++ b/test/e2e/helm_chart_test.go @@ -10,14 +10,14 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/cli/helm" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/cli/helm" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) var _ = Describe("HELM charts", Ordered, func() { diff --git a/test/e2e/integration_test.go b/test/e2e/integration_test.go index cd9489b345..2cc0caf4c5 100644 --- a/test/e2e/integration_test.go +++ b/test/e2e/integration_test.go @@ -8,14 +8,14 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/api/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/api/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Configuration namespaced. Deploy deployment", Label("integration-ns"), func() { diff --git a/test/e2e/k8s/k8s.go b/test/e2e/k8s/k8s.go index 9be9ba3986..39782adece 100644 --- a/test/e2e/k8s/k8s.go +++ b/test/e2e/k8s/k8s.go @@ -16,10 +16,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "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/test/e2e/utils" ) func CreateNewClient() (client.Client, error) { diff --git a/test/e2e/k8s/operator.go b/test/e2e/k8s/operator.go index e26933188e..55e0c026e1 100644 --- a/test/e2e/k8s/operator.go +++ b/test/e2e/k8s/operator.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatafederation" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatafederation" "go.uber.org/zap/zaptest" @@ -28,12 +28,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatabaseuser" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasproject" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatabaseuser" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdeployment" + "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" ) func BuildManager(initCfg *Config) (manager.Manager, error) { diff --git a/test/e2e/model/dataprovider.go b/test/e2e/model/dataprovider.go index b15cdc3cc2..ccbbae3ff7 100644 --- a/test/e2e/model/dataprovider.go +++ b/test/e2e/model/dataprovider.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" - kubecli "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" + kubecli "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) const ( diff --git a/test/e2e/model/dbuser.go b/test/e2e/model/dbuser.go index 91403febfa..cc806f0bef 100644 --- a/test/e2e/model/dbuser.go +++ b/test/e2e/model/dbuser.go @@ -5,9 +5,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "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/test/e2e/utils" ) type UserSpec v1.AtlasDatabaseUserSpec diff --git a/test/e2e/model/deployment.go b/test/e2e/model/deployment.go index 3151f86e96..6f6aa20a43 100644 --- a/test/e2e/model/deployment.go +++ b/test/e2e/model/deployment.go @@ -5,8 +5,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) type AtlasDeployment struct { diff --git a/test/e2e/model/project.go b/test/e2e/model/project.go index 2524cb54f4..23c89a4cb6 100644 --- a/test/e2e/model/project.go +++ b/test/e2e/model/project.go @@ -3,12 +3,12 @@ package model import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + v1 "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/api/v1/project" + "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/test/e2e/utils" ) type ProjectSpec v1.AtlasProjectSpec diff --git a/test/e2e/model/project_integration.go b/test/e2e/model/project_integration.go index 6c46c5d984..4de827faa8 100644 --- a/test/e2e/model/project_integration.go +++ b/test/e2e/model/project_integration.go @@ -1,7 +1,7 @@ package model import ( - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" ) type ProjectIntegration project.Integration diff --git a/test/e2e/model/team.go b/test/e2e/model/team.go index 0ad9fad0a0..52afeb79a4 100644 --- a/test/e2e/model/team.go +++ b/test/e2e/model/team.go @@ -1,7 +1,7 @@ package model import ( - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/test/e2e/model/user_input.go b/test/e2e/model/user_input.go index 5f5efb4cc3..ea621fc4e4 100644 --- a/test/e2e/model/user_input.go +++ b/test/e2e/model/user_input.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - . "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/utils" + . "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/utils" ) type UserInputs struct { diff --git a/test/e2e/multinamespace_test.go b/test/e2e/multinamespace_test.go index 97882756cf..6fea8ae72a 100644 --- a/test/e2e/multinamespace_test.go +++ b/test/e2e/multinamespace_test.go @@ -6,15 +6,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/stringutil" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "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/stringutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Users can use clusterwide configuration with limitation to watch only particular namespaces", Label("multinamespaced"), func() { diff --git a/test/e2e/network_peering_test.go b/test/e2e/network_peering_test.go index ec0c9b04b3..7449946fbf 100644 --- a/test/e2e/network_peering_test.go +++ b/test/e2e/network_peering_test.go @@ -10,14 +10,14 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) const ( diff --git a/test/e2e/operator_type_wide_test.go b/test/e2e/operator_type_wide_test.go index d9ff60c7ea..43239aab66 100644 --- a/test/e2e/operator_type_wide_test.go +++ b/test/e2e/operator_type_wide_test.go @@ -9,13 +9,13 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) // DO NOT RUN THIS TEST IN PARALLEL WITH OTHER TESTS diff --git a/test/e2e/private_link_test.go b/test/e2e/private_link_test.go index e4c6d3c45e..3b218422e7 100644 --- a/test/e2e/private_link_test.go +++ b/test/e2e/private_link_test.go @@ -8,14 +8,14 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) // NOTES diff --git a/test/e2e/project_deletion_protection_test.go b/test/e2e/project_deletion_protection_test.go index fce4a23d27..592d1f1dfb 100644 --- a/test/e2e/project_deletion_protection_test.go +++ b/test/e2e/project_deletion_protection_test.go @@ -8,31 +8,31 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "github.com/google/uuid" "go.mongodb.org/atlas/mongodbatlas" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloudaccess" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "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/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloudaccess" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Project Deletion Protection", Label("project", "deletion-protection"), func() { diff --git a/test/e2e/project_settings_test.go b/test/e2e/project_settings_test.go index 22aca1639f..a79511b0dc 100644 --- a/test/e2e/project_settings_test.go +++ b/test/e2e/project_settings_test.go @@ -4,12 +4,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("project-settings"), func() { diff --git a/test/e2e/serverless_pe_test.go b/test/e2e/serverless_pe_test.go index 12f3ce4916..5bb0982adc 100644 --- a/test/e2e/serverless_pe_test.go +++ b/test/e2e/serverless_pe_test.go @@ -8,14 +8,14 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/provider" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/cloud" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/atlasdeployment" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/cloud" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("serverless-pe"), func() { diff --git a/test/e2e/teams_test.go b/test/e2e/teams_test.go index eb64df4221..5f5f71b5da 100644 --- a/test/e2e/teams_test.go +++ b/test/e2e/teams_test.go @@ -7,12 +7,12 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + v1 "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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("Teams", Label("teams"), func() { diff --git a/test/e2e/utils/actrc_properties.go b/test/e2e/utils/actrc_properties.go index 70ab016fe8..09a4a7b381 100644 --- a/test/e2e/utils/actrc_properties.go +++ b/test/e2e/utils/actrc_properties.go @@ -5,7 +5,7 @@ import ( "os" "regexp" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/config" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/config" ) type Secrets map[string]string diff --git a/test/e2e/utils/utils.go b/test/e2e/utils/utils.go index 622b8c1774..7449b0a0a0 100644 --- a/test/e2e/utils/utils.go +++ b/test/e2e/utils/utils.go @@ -17,7 +17,7 @@ import ( "github.com/sethvargo/go-password/password" yaml "gopkg.in/yaml.v3" - v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + v1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" ) // LoadUserProjectConfig load configuration into object diff --git a/test/e2e/x509_test.go b/test/e2e/x509_test.go index 4817eec904..75e3507088 100644 --- a/test/e2e/x509_test.go +++ b/test/e2e/x509_test.go @@ -5,13 +5,13 @@ import ( . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions/deploy" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/k8s" - "github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model" + "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/test/e2e/actions" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/actions/deploy" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/data" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/k8s" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/e2e/model" ) var _ = Describe("UserLogin", Label("x509auth"), func() { diff --git a/test/int/backup_protected_test.go b/test/int/backup_protected_test.go index a2a7c5f2f3..95354cc291 100644 --- a/test/int/backup_protected_test.go +++ b/test/int/backup_protected_test.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + 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/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdeployment" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/int/clusterwide/dbuser_test.go b/test/int/clusterwide/dbuser_test.go index 43d8d2f04b..d22f9ff9c2 100644 --- a/test/int/clusterwide/dbuser_test.go +++ b/test/int/clusterwide/dbuser_test.go @@ -12,11 +12,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) const ( diff --git a/test/int/clusterwide/integration_suite_test.go b/test/int/clusterwide/integration_suite_test.go index 0f46fbd409..61ffd6e14b 100644 --- a/test/int/clusterwide/integration_suite_test.go +++ b/test/int/clusterwide/integration_suite_test.go @@ -36,18 +36,18 @@ import ( ctrzap "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatabaseuser" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatabaseuser" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasproject" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/httputil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/atlasproject" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/httputil" // +kubebuilder:scaffold:imports ) diff --git a/test/int/databaseuser_protected_test.go b/test/int/databaseuser_protected_test.go index 8d027128b8..2649f64db0 100644 --- a/test/int/databaseuser_protected_test.go +++ b/test/int/databaseuser_protected_test.go @@ -15,13 +15,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) var _ = Describe("Atlas Database User", Label("int", "AtlasDatabaseUser", "protection-enabled"), func() { diff --git a/test/int/databaseuser_unprotected_test.go b/test/int/databaseuser_unprotected_test.go index 2af79f96a2..0bbe0e4d8a 100644 --- a/test/int/databaseuser_unprotected_test.go +++ b/test/int/databaseuser_unprotected_test.go @@ -15,12 +15,12 @@ import ( apiErrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/timeutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/timeutil" corev1 "k8s.io/api/core/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" "go.mongodb.org/atlas/mongodbatlas" @@ -29,12 +29,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) const ( diff --git a/test/int/datafederation_protect_test.go b/test/int/datafederation_protect_test.go index bd89f4a481..9bbb8c63c9 100644 --- a/test/int/datafederation_protect_test.go +++ b/test/int/datafederation_protect_test.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) var _ = Describe("AtlasProject", Label("int", "AtlasDataFederation", "protection-enabled"), func() { diff --git a/test/int/datafederation_test.go b/test/int/datafederation_test.go index 35929de4d4..abdda24d16 100644 --- a/test/int/datafederation_test.go +++ b/test/int/datafederation_test.go @@ -8,20 +8,20 @@ import ( "k8s.io/apimachinery/pkg/types" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) var _ = Describe("AtlasDataFederation", Label("AtlasDataFederation"), func() { diff --git a/test/int/deployment_protected_test.go b/test/int/deployment_protected_test.go index 6a51cc03e0..94dcca964c 100644 --- a/test/int/deployment_protected_test.go +++ b/test/int/deployment_protected_test.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" k8serrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/int/deployment_test.go b/test/int/deployment_test.go index b255e1c3e2..fe0f26f4c9 100644 --- a/test/int/deployment_test.go +++ b/test/int/deployment_test.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/connectionsecret" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/connectionsecret" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/compat" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" @@ -24,17 +24,17 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + + 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/api/v1/project" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdeployment" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) const ( diff --git a/test/int/deployment_unprotected_test.go b/test/int/deployment_unprotected_test.go index ebb8179551..417b56b5d4 100644 --- a/test/int/deployment_unprotected_test.go +++ b/test/int/deployment_unprotected_test.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" k8serrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/int/federated_auth_test.go b/test/int/federated_auth_test.go index ba3959286a..3be8024499 100644 --- a/test/int/federated_auth_test.go +++ b/test/int/federated_auth_test.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -15,10 +15,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/common" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + 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/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) var _ = Describe("AtlasFederatedAuth test", Label("AtlasFederatedAuth", "federated-auth"), func() { diff --git a/test/int/integration_suite_test.go b/test/int/integration_suite_test.go index b6d7a11080..522fc59cdb 100644 --- a/test/int/integration_suite_test.go +++ b/test/int/integration_suite_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatafederation" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasfederatedauth" - "github.com/mongodb/mongodb-atlas-kubernetes/test/helper" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasdatafederation" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasfederatedauth" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/test/helper" "sigs.k8s.io/controller-runtime/pkg/client/config" @@ -49,14 +49,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdatabaseuser" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasdeployment" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlasproject" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/watch" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/httputil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/atlasdeployment" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/atlasproject" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/watch" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/httputil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" // +kubebuilder:scaffold:imports ) diff --git a/test/int/project_protect_test.go b/test/int/project_protect_test.go index 1a997ddada..999161195b 100644 --- a/test/int/project_protect_test.go +++ b/test/int/project_protect_test.go @@ -11,15 +11,15 @@ import ( corev1 "k8s.io/api/core/v1" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" "go.mongodb.org/atlas/mongodbatlas" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/toptr" ) var _ = Describe("AtlasProject", Label("int", "AtlasProject", "protection-enabled"), func() { diff --git a/test/int/project_test.go b/test/int/project_test.go index 0fefa02ffa..48039e2f99 100644 --- a/test/int/project_test.go +++ b/test/int/project_test.go @@ -7,7 +7,7 @@ import ( "net/http" "sync" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/version" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/version" "time" @@ -18,15 +18,15 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/customresource" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/customresource" - mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/project" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/atlas" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/controller/workflow" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/kube" - "github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/testutil" + mdbv1 "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1" + "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/controller/atlas" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/controller/workflow" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/kube" + "github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/util/testutil" ) const ( diff --git a/third_party_licenses.txt b/third_party_licenses.txt index 22645bd0fd..5396f458a7 100644 --- a/third_party_licenses.txt +++ b/third_party_licenses.txt @@ -26,7 +26,7 @@ github.com/matttproud/golang_protobuf_extensions/pbutil,https://github.com/mattt github.com/modern-go/concurrent,https://github.com/modern-go/concurrent/blob/bacd9c7ef1dd/LICENSE,Apache-2.0 github.com/modern-go/reflect2,https://github.com/modern-go/reflect2/blob/v1.0.2/LICENSE,Apache-2.0 github.com/mongodb-forks/digest,https://github.com/mongodb-forks/digest/blob/v1.0.5/COPYING,Apache-2.0 -github.com/mongodb/mongodb-atlas-kubernetes,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 +github.com/mongodb/mongodb-atlas-kubernetes/v2,https://github.com/mongodb/mongodb-atlas-kubernetes/blob/HEAD/LICENSE,Apache-2.0 github.com/munnerz/goautoneg,https://github.com/munnerz/goautoneg/blob/a7dc8b61c822/LICENSE,BSD-3-Clause github.com/pkg/errors,https://github.com/pkg/errors/blob/v0.9.1/LICENSE,BSD-2-Clause github.com/prometheus/client_golang/prometheus,https://github.com/prometheus/client_golang/blob/v1.14.0/LICENSE,Apache-2.0