Skip to content

Commit

Permalink
CLOUDP-211533: Bump Kubernetes Atlas Operator 2.0 go module major ver…
Browse files Browse the repository at this point in the history
…sion to 2 (#1239)

* bump all imports to /v2

* bump major version in go.mod
  • Loading branch information
s-urbaniak authored Nov 17, 2023
1 parent 93cbf28 commit 52b06fd
Show file tree
Hide file tree
Showing 208 changed files with 857 additions and 857 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-e2e-gov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-int.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -202,17 +202,17 @@ 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
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)
Expand Down
20 changes: 10 additions & 10 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/post-install/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/mongodb/mongodb-atlas-kubernetes
module github.com/mongodb/mongodb-atlas-kubernetes/v2

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion licenses.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/v1/alert_configurations.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"go.mongodb.org/atlas/mongodbatlas"
"go.uber.org/zap"

"github.com/mongodb/mongodb-atlas-kubernetes/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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasbackuppolicy_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasbackupschedule_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasbackupschedule_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/go-test/deep"
"go.mongodb.org/atlas/mongodbatlas"

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

func Test_BackupScheduleToAtlas(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlascustomresource.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/v1/atlasdatabaseuser_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/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:
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/v1/atlasdatafederation_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/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() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasdatafederation_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/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) {
Expand Down
12 changes: 6 additions & 6 deletions pkg/api/v1/atlasdeployment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/atlasdeployment_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

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

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/v1/atlasfederatedauth_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/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() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasfederatedauth_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/assert"
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/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) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/v1/atlasproject_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/mongodb/mongodb-atlas-kubernetes/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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/atlasteam_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v1

import (
"github.com/mongodb/mongodb-atlas-kubernetes/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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/auditing.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

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

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

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

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

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

func TestAtlasCustomRoles_ToAtlas(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/encryption_at_rest.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/networkpeer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v1
import (
"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/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 {
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/v1/privateendpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

"github.com/mongodb/mongodb-atlas-kubernetes/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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/project/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/project/ipaccesslist.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"go.mongodb.org/atlas/mongodbatlas"

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

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

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

type ProjectSettings struct {
Expand Down
Loading

0 comments on commit 52b06fd

Please sign in to comment.