From bd6d45bbc4f3a102c5e93f9f8485cd9e3bab71e3 Mon Sep 17 00:00:00 2001
From: Igor Karpukhin <karpukhinigor@gmail.com>
Date: Fri, 29 Aug 2025 14:00:58 +0200
Subject: [PATCH 1/3] Remove go build tags for unit and e2e tests and run tests
 by their names instead of tags

---
 Makefile                                               |  9 ++++-----
 build/ci/evergreen.yml                                 | 10 +++++-----
 internal/cli/kubernetes/config/apply_test.go           |  1 -
 internal/cli/kubernetes/config/generate_test.go        |  1 -
 internal/cli/kubernetes/operator/install_test.go       |  1 -
 internal/kubernetes/operator/config_exporter_test.go   |  1 -
 internal/kubernetes/operator/dbusers/dbusers_test.go   |  1 -
 .../kubernetes/operator/deployment/deployment_test.go  |  1 -
 .../kubernetes/operator/project/containers_test.go     |  1 -
 .../kubernetes/operator/project/customroles_test.go    |  1 -
 .../kubernetes/operator/project/integrations_test.go   |  1 -
 .../kubernetes/operator/project/ipaccesslist_test.go   |  1 -
 internal/kubernetes/operator/project/peerings_test.go  |  1 -
 .../operator/project/privateendpoints_test.go          |  1 -
 internal/kubernetes/operator/project/project_test.go   |  1 -
 .../kubernetes/operator/resources/normalizer_test.go   |  1 -
 internal/store/store_test.go                           |  1 -
 internal/validate/validate_test.go                     |  1 -
 test/e2e/atlas_e2e_test_generator_test.go              |  1 -
 test/e2e/cli.go                                        |  1 -
 test/e2e/cli_test.go                                   |  1 -
 test/e2e/helper_test.go                                |  1 -
 test/e2e/kubernetes_config_apply_test.go               |  1 -
 test/e2e/kubernetes_config_generate_test.go            |  1 -
 test/e2e/kubernetes_operator_install_test.go           |  1 -
 test/e2e/kubernetes_test.go                            |  1 -
 test/e2e/operator_helper_test.go                       |  1 -
 27 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index f41fa9de..81c1d92a 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,13 @@ MANIFEST_FILE?=manifest.yml
 WIN_MANIFEST_FILE?=manifest.windows.yml
 
 TEST_CMD?=go test
-UNIT_TAGS?=unit
 COVERAGE?=coverage.out
 
 E2E_PLUGIN_BINARY_PATH=../../$(PLUGIN_BINARY_PATH)
-E2E_TAGS?=e2e
 E2E_TIMEOUT?=60m
 E2E_PARALLEL?=1
 E2E_EXTRA_ARGS?=
+E2E_RUN_PATTERN?=.*
 
 export E2E_PLUGIN_BINARY_PATH
 export E2E_ATLASCLI_BINARY_PATH
@@ -63,12 +62,12 @@ lint: ## Run linter
 .PHONY: unit-test
 unit-test: ## Run unit-tests
 	@echo "==> Running unit tests..."
-	$(TEST_CMD) --tags="$(UNIT_TAGS)" -race -cover -coverprofile $(COVERAGE) -count=1 ./...
+	$(TEST_CMD) -race -cover -coverprofile $(COVERAGE) -count=1 ./internal/... ./cmd/...
 
 .PHONY: fuzz-normalizer-test
 fuzz-normalizer-test: ## Run fuzz test
 	@echo "==> Running fuzz test..."
-	$(TEST_CMD) -fuzz=Fuzz -fuzztime 50s --tags="$(UNIT_TAGS)" -race ./internal/kubernetes/operator/resources
+	$(TEST_CMD) -fuzz=Fuzz -fuzztime 50s -race ./internal/kubernetes/operator/resources
 
 .PHONY: build-debug
 build-debug: ## Generate a binary in ./bin for debugging plugin
@@ -80,7 +79,7 @@ e2e-test: build-debug ## Run E2E tests
 # the target assumes the MCLI_* environment variables are exported
 	@./scripts/atlas-binary.sh
 	@echo "==> Running E2E tests..."
-	GOCOVERDIR=$(GOCOVERDIR) $(TEST_CMD) -race -v -p 1 -parallel $(E2E_PARALLEL) -v -timeout $(E2E_TIMEOUT) -tags="$(E2E_TAGS)" ./test/e2e... $(E2E_EXTRA_ARGS)
+	GOCOVERDIR=$(GOCOVERDIR) $(TEST_CMD) -race -v -p 1 -parallel $(E2E_PARALLEL) -v -timeout $(E2E_TIMEOUT) -run="$(E2E_RUN_PATTERN)" ./test/e2e... $(E2E_EXTRA_ARGS)
 
 .PHONY: gen-mocks
 gen-mocks: ## Generate mocks
diff --git a/build/ci/evergreen.yml b/build/ci/evergreen.yml
index 8e4275f0..aa842241 100644
--- a/build/ci/evergreen.yml
+++ b/build/ci/evergreen.yml
@@ -94,7 +94,7 @@ functions:
           - MCLI_PUBLIC_API_KEY
           - MCLI_SERVICE
           - TEST_CMD
-          - E2E_TAGS
+          - E2E_RUN_PATTERN
           - MCLI_OPS_MANAGER_URL
           - OM_VERSION
           - LOCAL_KEY
@@ -262,7 +262,7 @@ tasks:
           AZURE_CLIENT_SECRET: ${azure_client_secret}
           GOOGLE_PROJECT_ID: ${google_project_id}
           GCP_SA_CRED: ${gcp_sa_cred}
-          E2E_TAGS: atlas,cli
+          E2E_RUN_PATTERN: TestKubernetesPluginBinary
   - name: atlas_kubernetes_generate_e2e
     tags: ["e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas"]
     must_have_test_results: true
@@ -290,7 +290,7 @@ tasks:
           AZURE_CLIENT_SECRET: ${azure_client_secret}
           GOOGLE_PROJECT_ID: ${google_project_id}
           GCP_SA_CRED: ${gcp_sa_cred}
-          E2E_TAGS: generate
+          E2E_RUN_PATTERN: TestExport.*|TestGenerate.*|TestProject.*|TestFederatedAuthTest|TestEmptyProject|TestKubernetesConfigGenerate.*
   - name: atlas_kubernetes_apply_e2e
     tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
     must_have_test_results: true
@@ -318,7 +318,7 @@ tasks:
           AZURE_CLIENT_SECRET: ${azure_client_secret}
           GOOGLE_PROJECT_ID: ${google_project_id}
           GCP_SA_CRED: ${gcp_sa_cred}
-          E2E_TAGS: apply
+          E2E_RUN_PATTERN: TestKubernetesConfigApply.*
   - name: atlas_kubernetes_install_e2e
     tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
     must_have_test_results: true
@@ -346,7 +346,7 @@ tasks:
           AZURE_CLIENT_SECRET: ${azure_client_secret}
           GOOGLE_PROJECT_ID: ${google_project_id}
           GCP_SA_CRED: ${gcp_sa_cred}
-          E2E_TAGS: install
+          E2E_RUN_PATTERN: TestKubernetesOperatorInstall
 buildvariants:
   - name: code_health
     display_name: "Code Health"
diff --git a/internal/cli/kubernetes/config/apply_test.go b/internal/cli/kubernetes/config/apply_test.go
index ce614ef9..c2da1ad4 100644
--- a/internal/cli/kubernetes/config/apply_test.go
+++ b/internal/cli/kubernetes/config/apply_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package config
 
diff --git a/internal/cli/kubernetes/config/generate_test.go b/internal/cli/kubernetes/config/generate_test.go
index 09c265b3..5748f75d 100644
--- a/internal/cli/kubernetes/config/generate_test.go
+++ b/internal/cli/kubernetes/config/generate_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package config
 
diff --git a/internal/cli/kubernetes/operator/install_test.go b/internal/cli/kubernetes/operator/install_test.go
index 243ea636..d3922ba1 100644
--- a/internal/cli/kubernetes/operator/install_test.go
+++ b/internal/cli/kubernetes/operator/install_test.go
@@ -12,6 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package operator
diff --git a/internal/kubernetes/operator/config_exporter_test.go b/internal/kubernetes/operator/config_exporter_test.go
index d6fa0780..63a38011 100644
--- a/internal/kubernetes/operator/config_exporter_test.go
+++ b/internal/kubernetes/operator/config_exporter_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package operator
 
diff --git a/internal/kubernetes/operator/dbusers/dbusers_test.go b/internal/kubernetes/operator/dbusers/dbusers_test.go
index 7228e96f..86c73b05 100644
--- a/internal/kubernetes/operator/dbusers/dbusers_test.go
+++ b/internal/kubernetes/operator/dbusers/dbusers_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package dbusers
 
diff --git a/internal/kubernetes/operator/deployment/deployment_test.go b/internal/kubernetes/operator/deployment/deployment_test.go
index 0d22c13b..91393b5e 100644
--- a/internal/kubernetes/operator/deployment/deployment_test.go
+++ b/internal/kubernetes/operator/deployment/deployment_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package deployment
 
diff --git a/internal/kubernetes/operator/project/containers_test.go b/internal/kubernetes/operator/project/containers_test.go
index b9d619db..2034b054 100644
--- a/internal/kubernetes/operator/project/containers_test.go
+++ b/internal/kubernetes/operator/project/containers_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/project/customroles_test.go b/internal/kubernetes/operator/project/customroles_test.go
index 770e3e7d..631458e6 100644
--- a/internal/kubernetes/operator/project/customroles_test.go
+++ b/internal/kubernetes/operator/project/customroles_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 //nolint:all
 package project
diff --git a/internal/kubernetes/operator/project/integrations_test.go b/internal/kubernetes/operator/project/integrations_test.go
index 1365e4f3..fdb10550 100644
--- a/internal/kubernetes/operator/project/integrations_test.go
+++ b/internal/kubernetes/operator/project/integrations_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/project/ipaccesslist_test.go b/internal/kubernetes/operator/project/ipaccesslist_test.go
index 2b64b24f..321c296c 100644
--- a/internal/kubernetes/operator/project/ipaccesslist_test.go
+++ b/internal/kubernetes/operator/project/ipaccesslist_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/project/peerings_test.go b/internal/kubernetes/operator/project/peerings_test.go
index 33bd9352..8e3c7a22 100644
--- a/internal/kubernetes/operator/project/peerings_test.go
+++ b/internal/kubernetes/operator/project/peerings_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/project/privateendpoints_test.go b/internal/kubernetes/operator/project/privateendpoints_test.go
index c5cec2a6..101ee5f7 100644
--- a/internal/kubernetes/operator/project/privateendpoints_test.go
+++ b/internal/kubernetes/operator/project/privateendpoints_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/project/project_test.go b/internal/kubernetes/operator/project/project_test.go
index 950bdf8b..0cff11c5 100644
--- a/internal/kubernetes/operator/project/project_test.go
+++ b/internal/kubernetes/operator/project/project_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package project
 
diff --git a/internal/kubernetes/operator/resources/normalizer_test.go b/internal/kubernetes/operator/resources/normalizer_test.go
index 7e395bc2..61cc5549 100644
--- a/internal/kubernetes/operator/resources/normalizer_test.go
+++ b/internal/kubernetes/operator/resources/normalizer_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package resources
 
diff --git a/internal/store/store_test.go b/internal/store/store_test.go
index 76d22d43..d784b250 100644
--- a/internal/store/store_test.go
+++ b/internal/store/store_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package store
 
diff --git a/internal/validate/validate_test.go b/internal/validate/validate_test.go
index 219e47a9..2e20e682 100644
--- a/internal/validate/validate_test.go
+++ b/internal/validate/validate_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build unit
 
 package validate
 
diff --git a/test/e2e/atlas_e2e_test_generator_test.go b/test/e2e/atlas_e2e_test_generator_test.go
index dd5166c4..02608896 100644
--- a/test/e2e/atlas_e2e_test_generator_test.go
+++ b/test/e2e/atlas_e2e_test_generator_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || install || generate || apply
 
 package e2e
 
diff --git a/test/e2e/cli.go b/test/e2e/cli.go
index 0e25c98a..120ea8c6 100644
--- a/test/e2e/cli.go
+++ b/test/e2e/cli.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || cli || install || generate || apply
 
 package e2e
 
diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
index e719ce6f..bed38763 100644
--- a/test/e2e/cli_test.go
+++ b/test/e2e/cli_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || cli
 
 package e2e
 
diff --git a/test/e2e/helper_test.go b/test/e2e/helper_test.go
index 181a07aa..00d06e7c 100644
--- a/test/e2e/helper_test.go
+++ b/test/e2e/helper_test.go
@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//go:build e2e || install || generate || apply
 
 package e2e
 
diff --git a/test/e2e/kubernetes_config_apply_test.go b/test/e2e/kubernetes_config_apply_test.go
index 70494716..f0a6c1da 100644
--- a/test/e2e/kubernetes_config_apply_test.go
+++ b/test/e2e/kubernetes_config_apply_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || apply
 
 package e2e
 
diff --git a/test/e2e/kubernetes_config_generate_test.go b/test/e2e/kubernetes_config_generate_test.go
index 572e4b1a..43046e89 100644
--- a/test/e2e/kubernetes_config_generate_test.go
+++ b/test/e2e/kubernetes_config_generate_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || generate
 
 package e2e
 
diff --git a/test/e2e/kubernetes_operator_install_test.go b/test/e2e/kubernetes_operator_install_test.go
index fb44ceb7..76d94db7 100644
--- a/test/e2e/kubernetes_operator_install_test.go
+++ b/test/e2e/kubernetes_operator_install_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || install
 
 package e2e
 
diff --git a/test/e2e/kubernetes_test.go b/test/e2e/kubernetes_test.go
index 1ec18d12..42e68af2 100644
--- a/test/e2e/kubernetes_test.go
+++ b/test/e2e/kubernetes_test.go
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:build e2e || apply || generate || install
 
 package e2e
 
diff --git a/test/e2e/operator_helper_test.go b/test/e2e/operator_helper_test.go
index 853703d8..67e96804 100644
--- a/test/e2e/operator_helper_test.go
+++ b/test/e2e/operator_helper_test.go
@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//go:build e2e || install || generate || apply
 
 package e2e
 

From 3e4464f32c333e09ad4ac98b214a84f03381b16f Mon Sep 17 00:00:00 2001
From: Igor Karpukhin <karpukhinigor@gmail.com>
Date: Fri, 29 Aug 2025 17:12:52 +0200
Subject: [PATCH 2/3] Make linter happy

---
 .../operator/project/project_test.go          |  8 +++---
 test/e2e/atlas_e2e_test_generator_test.go     | 13 +++++-----
 test/e2e/helper_test.go                       |  6 ++---
 test/e2e/kubernetes_config_generate_test.go   | 26 +++++++++----------
 test/e2e/kubernetes_test.go                   | 12 ++++-----
 5 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/internal/kubernetes/operator/project/project_test.go b/internal/kubernetes/operator/project/project_test.go
index 0cff11c5..7b8fa5fb 100644
--- a/internal/kubernetes/operator/project/project_test.go
+++ b/internal/kubernetes/operator/project/project_test.go
@@ -543,8 +543,8 @@ func TestBuildAtlasProject(t *testing.T) {
 						},
 					},
 					BackupCompliancePolicyRef: &akov2common.ResourceRefNamespaced{
-						Name:      expectedBCP.ObjectMeta.Name,
-						Namespace: expectedBCP.ObjectMeta.Namespace,
+						Name:      expectedBCP.Name,
+						Namespace: expectedBCP.Namespace,
 					},
 				},
 				Status: akov2status.AtlasProjectStatus{
@@ -637,8 +637,8 @@ func TestBuildAtlasProject(t *testing.T) {
 						},
 					},
 					BackupCompliancePolicyRef: &akov2common.ResourceRefNamespaced{
-						Name:      expectedBCP.ObjectMeta.Name,
-						Namespace: expectedBCP.ObjectMeta.Namespace,
+						Name:      expectedBCP.Name,
+						Namespace: expectedBCP.Namespace,
 					},
 				},
 				Status: akov2status.AtlasProjectStatus{
diff --git a/test/e2e/atlas_e2e_test_generator_test.go b/test/e2e/atlas_e2e_test_generator_test.go
index 02608896..22a638c3 100644
--- a/test/e2e/atlas_e2e_test_generator_test.go
+++ b/test/e2e/atlas_e2e_test_generator_test.go
@@ -30,15 +30,14 @@ import (
 	"cloud.google.com/go/compute/apiv1/computepb"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/aws" //nolint:staticcheck
+	"github.com/aws/aws-sdk-go/aws/session" //nolint:staticcheck
+	"github.com/aws/aws-sdk-go/service/ec2" //nolint:staticcheck
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/internal/pointer"
 	"github.com/mongodb/atlas-cli-plugin-kubernetes/test"
 	akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/atlas-sdk/v20241113004/admin"
 	atlasv2 "go.mongodb.org/atlas-sdk/v20241113004/admin"
 )
 
@@ -641,7 +640,7 @@ func ensureGCPCredentials() error {
 		return fmt.Errorf("failed to save credentials contents GCP_SA_CRED to %s: %w",
 			googleSAFilename, err)
 	}
-	os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", googleSAFilename)
+	_ = os.Setenv("GOOGLE_APPLICATION_CREDENTIALS", googleSAFilename)
 	return nil
 }
 
@@ -669,7 +668,7 @@ func (g *atlasE2ETestGenerator) deletePeering(id string) {
 	timeout := 5 * time.Minute
 	for {
 		_, _, err := client.NetworkPeeringApi.GetPeeringConnection(ctx, g.projectID, id).Execute()
-		if admin.IsErrorCode(err, "PEER_NOT_FOUND") {
+		if atlasv2.IsErrorCode(err, "PEER_NOT_FOUND") {
 			return
 		}
 		if err != nil {
@@ -755,7 +754,7 @@ func deleteProjectWithRetry(t *testing.T, projectID string) {
 
 func deleteKeys(t *testing.T, toDelete map[string]struct{}) {
 	t.Helper()
-	cliPath, err := AtlasCLIBin()
+	cliPath, _ := AtlasCLIBin()
 
 	cmd := exec.Command(cliPath,
 		orgEntity,
diff --git a/test/e2e/helper_test.go b/test/e2e/helper_test.go
index 00d06e7c..b2979a33 100644
--- a/test/e2e/helper_test.go
+++ b/test/e2e/helper_test.go
@@ -1064,7 +1064,7 @@ func generateTestAtlasStreamInstance(t *testing.T, projectID string, instanceNam
 
 	t.Cleanup(func() {
 		t.Logf("Deleting test Stream Instance: %s", instanceName)
-		deleteStreamsInstance(t, projectID, instanceName)
+		_ = deleteStreamsInstance(t, projectID, instanceName)
 	})
 
 	return instanceName
@@ -1101,7 +1101,7 @@ func generateTestAtlasAdvancedDeployment(t *testing.T, projectID string, cluster
 
 	t.Cleanup(func() {
 		t.Logf("Deleting test Advanced Deployment: %s", clusterName)
-		deleteClusterForProject(projectID, clusterName)
+		_ = deleteClusterForProject(projectID, clusterName)
 	})
 
 	return clusterName
@@ -1140,7 +1140,7 @@ func generateTestAtlasFlexCluster(t *testing.T, projectID string, clusterName st
 
 	t.Cleanup(func() {
 		t.Logf("Deleting test Advanced Deployment: %s", clusterName)
-		deleteClusterForProject(projectID, clusterName)
+		_ = deleteClusterForProject(projectID, clusterName)
 	})
 
 	return clusterName
diff --git a/test/e2e/kubernetes_config_generate_test.go b/test/e2e/kubernetes_config_generate_test.go
index 43046e89..ed9d416e 100644
--- a/test/e2e/kubernetes_config_generate_test.go
+++ b/test/e2e/kubernetes_config_generate_test.go
@@ -28,13 +28,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
 	akoapi "github.com/mongodb/mongodb-atlas-kubernetes/v2/api"
 	akov2 "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1"
 	akov2common "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common"
 	akov2project "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project"
 	akov2provider "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider"
-	"github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
 	akov2status "github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -496,7 +494,7 @@ func TestExportIntegrations(t *testing.T) {
 							SendDatabaseMetrics:          pointer.Get("disabled"),
 						},
 					},
-					Status: status.AtlasThirdPartyIntegrationStatus{
+					Status: akov2status.AtlasThirdPartyIntegrationStatus{
 						ID: integrationID,
 					},
 				},
@@ -534,7 +532,7 @@ func TestExportIntegrations(t *testing.T) {
 							SendDatabaseMetrics:          pointer.Get("disabled"),
 						},
 					},
-					Status: status.AtlasThirdPartyIntegrationStatus{
+					Status: akov2status.AtlasThirdPartyIntegrationStatus{
 						ID: integrationID,
 					},
 				},
@@ -732,8 +730,8 @@ func customContainer(generator *atlasE2ETestGenerator, independent bool, resourc
 		},
 		Spec: *spec,
 		Status: akov2status.AtlasNetworkContainerStatus{
-			Common: api.Common{
-				Conditions: []api.Condition{},
+			Common: akoapi.Common{
+				Conditions: []akoapi.Condition{},
 			},
 		},
 	}
@@ -836,8 +834,8 @@ func customPeering(generator *atlasE2ETestGenerator, independent bool, resourceN
 		},
 		Spec: *spec,
 		Status: akov2status.AtlasNetworkPeeringStatus{
-			Common: api.Common{
-				Conditions: []api.Condition{},
+			Common: akoapi.Common{
+				Conditions: []akoapi.Condition{},
 			},
 		},
 	}
@@ -1106,11 +1104,11 @@ func defaultTestUser(name, projectName, namespace string) *akov2.AtlasDatabaseUs
 
 func defaultTestUserWithID(name, projectName, projectID, namespace string, creds string) *akov2.AtlasDatabaseUser {
 	user := defaultTestUser(name, projectName, namespace)
-	user.Spec.ProjectDualReference.ProjectRef = nil
-	user.Spec.ProjectDualReference.ExternalProjectRef = &akov2.ExternalProjectReference{
+	user.Spec.ProjectRef = nil
+	user.Spec.ExternalProjectRef = &akov2.ExternalProjectReference{
 		ID: projectID,
 	}
-	user.Spec.ProjectDualReference.ConnectionSecret = &akoapi.LocalObjectReference{
+	user.Spec.ConnectionSecret = &akoapi.LocalObjectReference{
 		Name: creds,
 	}
 	return user
@@ -1178,11 +1176,11 @@ func defaultM0TestCluster(name, region, projectName, namespace string) *akov2.At
 
 func defaultM0TestClusterWithID(name, region, projectName, projectID, namespace, creds string) *akov2.AtlasDeployment {
 	deployment := defaultM0TestCluster(name, region, projectName, namespace)
-	deployment.Spec.ProjectDualReference.ProjectRef = nil
-	deployment.Spec.ProjectDualReference.ExternalProjectRef = &akov2.ExternalProjectReference{
+	deployment.Spec.ProjectRef = nil
+	deployment.Spec.ExternalProjectRef = &akov2.ExternalProjectReference{
 		ID: projectID,
 	}
-	deployment.Spec.ProjectDualReference.ConnectionSecret = &akoapi.LocalObjectReference{
+	deployment.Spec.ConnectionSecret = &akoapi.LocalObjectReference{
 		Name: creds,
 	}
 	return deployment
diff --git a/test/e2e/kubernetes_test.go b/test/e2e/kubernetes_test.go
index 42e68af2..007c01cc 100644
--- a/test/e2e/kubernetes_test.go
+++ b/test/e2e/kubernetes_test.go
@@ -67,10 +67,10 @@ func setQACredentialsEnvVars() {
 	saveEnv("MCLI_OPS_MANAGER_URL")
 	saveEnv("MCLI_PUBLIC_API_KEY")
 	saveEnv("MCLI_PRIVATE_API_KEY")
-	os.Setenv("MCLI_ORG_ID", os.Getenv("QA_MCLI_ORG_ID"))
-	os.Setenv("MCLI_OPS_MANAGER_URL", os.Getenv("QA_MCLI_OPS_MANAGER_URL"))
-	os.Setenv("MCLI_PUBLIC_API_KEY", os.Getenv("QA_MCLI_PUBLIC_API_KEY"))
-	os.Setenv("MCLI_PRIVATE_API_KEY", os.Getenv("QA_MCLI_PRIVATE_API_KEY"))
+	_ = os.Setenv("MCLI_ORG_ID", os.Getenv("QA_MCLI_ORG_ID"))
+	_ = os.Setenv("MCLI_OPS_MANAGER_URL", os.Getenv("QA_MCLI_OPS_MANAGER_URL"))
+	_ = os.Setenv("MCLI_PUBLIC_API_KEY", os.Getenv("QA_MCLI_PUBLIC_API_KEY"))
+	_ = os.Setenv("MCLI_PRIVATE_API_KEY", os.Getenv("QA_MCLI_PRIVATE_API_KEY"))
 }
 
 func restoreEnvVars() {
@@ -81,11 +81,11 @@ func restoreEnvVars() {
 }
 
 func saveEnv(envvar string) {
-	os.Setenv(savedEnvVar(envvar), os.Getenv(envvar))
+	_ = os.Setenv(savedEnvVar(envvar), os.Getenv(envvar))
 }
 
 func restoreEnv(envvar string) {
-	os.Setenv(envvar, os.Getenv(savedEnvVar(envvar)))
+	_ = os.Setenv(envvar, os.Getenv(savedEnvVar(envvar)))
 }
 
 func savedEnvVar(envvar string) string {

From e86eba602591d8707ffa180d38e29c8f2fbc47e3 Mon Sep 17 00:00:00 2001
From: Igor Karpukhin <karpukhinigor@gmail.com>
Date: Sat, 30 Aug 2025 09:47:11 +0200
Subject: [PATCH 3/3] Commented e2e tags for evergreen

---
 build/ci/evergreen.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/ci/evergreen.yml b/build/ci/evergreen.yml
index aa842241..b72c93d0 100644
--- a/build/ci/evergreen.yml
+++ b/build/ci/evergreen.yml
@@ -264,7 +264,7 @@ tasks:
           GCP_SA_CRED: ${gcp_sa_cred}
           E2E_RUN_PATTERN: TestKubernetesPluginBinary
   - name: atlas_kubernetes_generate_e2e
-    tags: ["e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas"]
+#    tags: ["e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas"]
     must_have_test_results: true
     commands:
       - func: "install gotestsum"
@@ -292,7 +292,7 @@ tasks:
           GCP_SA_CRED: ${gcp_sa_cred}
           E2E_RUN_PATTERN: TestExport.*|TestGenerate.*|TestProject.*|TestFederatedAuthTest|TestEmptyProject|TestKubernetesConfigGenerate.*
   - name: atlas_kubernetes_apply_e2e
-    tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
+#    tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
     must_have_test_results: true
     commands:
       - func: "install gotestsum"
@@ -320,7 +320,7 @@ tasks:
           GCP_SA_CRED: ${gcp_sa_cred}
           E2E_RUN_PATTERN: TestKubernetesConfigApply.*
   - name: atlas_kubernetes_install_e2e
-    tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
+#    tags: [ "e2e","required","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
     must_have_test_results: true
     commands:
       - func: "install gotestsum"