Skip to content

Commit a78cb6d

Browse files
jeroenvervaekejeroenvervaeke
committed
Merge branch 'master' into CLOUDP-293110 
2 parents 4fe5dd0 + 23a66ee commit a78cb6d

38 files changed

+348
-266
lines changed

‎.github/workflows/code-health.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ jobs:
354354
- name: Set up Docker Buildx
355355
uses: docker/setup-buildx-action@v3.8.0
356356
- name: Build image to dockerhub staging registry
357-
uses: docker/build-push-action@v6.10.0
357+
uses: docker/build-push-action@v6.11.0
358358
with:
359359
context: .
360360
platforms: linux/amd64,linux/arm64

‎.github/workflows/docker-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
username: "${{ secrets.DOCKERHUB_USER }}"
4242
password: "${{ secrets.DOCKERHUB_SECRET }}"
4343
- name: Build and push image to dockerhub staging registry
44-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355
44+
uses: docker/build-push-action@31ca4e5d51253d7e4a2317bfe74699cbe3a398a9
4545
with:
4646
context: .
4747
platforms: ${{ env.PLATFORMS }}

‎.golangci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ linters-settings:
1717
alias: atlas
1818
- pkg: go.mongodb.org/atlas/auth
1919
alias: atlasauth
20-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api
20+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api
2121
alias: akoapi
22-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1
22+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1
2323
alias: akov2
24-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/common
24+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/common
2525
alias: akov2common
26-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/provider
26+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/provider
2727
alias: akov2provider
28-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/status
28+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/status
2929
alias: akov2status
30-
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/pkg/api/v1/project
30+
- pkg: github.com/mongodb/mongodb-atlas-kubernetes/v2/api/v1/project
3131
alias: akov2project
3232
- pkg: k8s.io/apimachinery/pkg/apis/meta/v1
3333
alias: metav1

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ list: ## List all make targets
165165
check-library-owners: ## Check that all the dependencies in go.mod has a owner in library_owners.json
166166
@echo "==> Check library_owners.json"
167167
go run ./tools/libraryowners/main.go
168+
./scripts/verify-library-owners-sorted.sh
168169

169170
.PHONY: update-atlas-sdk
170171
update-atlas-sdk: ## Update the atlas-sdk dependency

‎build/ci/evergreen.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,24 @@ tasks:
803803
MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
804804
MCLI_SERVICE: cloud
805805
E2E_TAGS: atlas,cluster,kubernetes,apply
806+
- name: atlas_kubernetes_install_e2e
807+
tags: [ "e2e","atlas","kubernetes", "assigned_to_jira_team_cloudp_kubernetes_atlas" ]
808+
must_have_test_results: true
809+
depends_on:
810+
- name: atlas_clusters_flags_e2e
811+
variant: "e2e_atlas_clusters"
812+
patch_optional: true
813+
commands:
814+
- func: "install gotestsum"
815+
- func: "e2e test"
816+
vars:
817+
MCLI_ORG_ID: ${atlas_org_id}
818+
MCLI_PROJECT_ID: ${atlas_project_id}
819+
MCLI_PRIVATE_API_KEY: ${atlas_private_api_key}
820+
MCLI_PUBLIC_API_KEY: ${atlas_public_api_key}
821+
MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
822+
MCLI_SERVICE: cloud
823+
E2E_TAGS: atlas,cluster,kubernetes,local
806824
- name: atlas_clusters_upgrade_e2e
807825
tags: ["e2e","clusters","atlas"]
808826
must_have_test_results: true
@@ -1100,6 +1118,7 @@ tasks:
11001118
# Search depend on a cluster to create the indexes against
11011119
- name: atlas_search_e2e
11021120
tags: ["e2e","clusters","atlas"]
1121+
exec_timeout_secs: 11400 # 3 hours 10 minutes
11031122
must_have_test_results: true
11041123
depends_on:
11051124
- name: atlas_clusters_flags_e2e
@@ -1116,6 +1135,7 @@ tasks:
11161135
MCLI_OPS_MANAGER_URL: ${mcli_ops_manager_url}
11171136
MCLI_SERVICE: cloud
11181137
E2E_TAGS: atlas,search
1138+
E2E_TIMEOUT: 3h
11191139
- name: atlas_gov_search_e2e
11201140
tags: ["e2e","clusters","atlasgov"]
11211141
must_have_test_results: true

‎build/ci/library_owners.json‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
{
2-
"cloud.google.com/go/kms": "apix-2",
3-
"github.com/AlecAivazis/survey/v2": "apix-2",
4-
"github.com/Azure/azure-sdk-for-go/sdk/azcore": "apix-2",
5-
"github.com/Azure/azure-sdk-for-go/sdk/azidentity": "apix-2",
6-
"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys": "apix-2",
7-
"github.com/Masterminds/semver/v3": "apix-2",
8-
"github.com/PaesslerAG/jsonpath": "apix-2",
9-
"github.com/aws/aws-sdk-go-v2": "apix-2",
10-
"github.com/aws/aws-sdk-go-v2/config": "apix-2",
11-
"github.com/aws/aws-sdk-go-v2/credentials": "apix-2",
12-
"github.com/aws/aws-sdk-go-v2/service/kms": "apix-2",
13-
"github.com/briandowns/spinner": "apix-2",
14-
"github.com/evergreen-ci/shrub": "apix-2",
15-
"github.com/go-test/deep": "apix-2",
16-
"github.com/golang-jwt/jwt/v4": "apix-2",
17-
"github.com/golang/mock": "apix-2",
18-
"github.com/google/go-github/v61": "apix-2",
19-
"github.com/google/uuid": "atlas_kubernetes_team",
20-
"github.com/klauspost/compress": "apix-2",
21-
"github.com/mattn/go-isatty": "apix-2",
22-
"github.com/mongodb-forks/digest": "apix-2",
23-
"github.com/mongodb-labs/cobra2snooty": "apix-2",
24-
"github.com/pelletier/go-toml": "apix-2",
25-
"github.com/Netflix/go-expect": "apix-2",
26-
"github.com/creack/pty": "apix-2",
27-
"github.com/hinshun/vt10x": "apix-2",
28-
"github.com/pkg/browser": "apix-2",
29-
"github.com/spf13/afero": "apix-2",
30-
"github.com/spf13/cobra": "apix-2",
31-
"github.com/spf13/pflag": "apix-2",
32-
"github.com/spf13/viper": "apix-2",
33-
"github.com/stretchr/testify": "apix-2",
34-
"github.com/tangzero/inflector": "apix-2",
35-
"go.mongodb.org/atlas": "apix-2",
36-
"go.mongodb.org/atlas-sdk/v20241113004": "apix-2",
37-
"go.mongodb.org/atlas-sdk/v20240530005": "apix-2",
38-
"go.mongodb.org/atlas-sdk/v20241113001": "apix-2",
39-
"go.mongodb.org/mongo-driver": "apix-2",
40-
"golang.org/x/sys": "apix-2",
41-
"golang.org/x/tools": "apix-2",
42-
"google.golang.org/api": "apix-2",
43-
"google.golang.org/protobuf": "apix-2",
44-
"golang.org/x/mod": "apix-2",
45-
"gopkg.in/yaml.v3": "apix-2",
46-
"github.com/mongodb/mongodb-atlas-kubernetes/v2": "atlas_kubernetes_team",
47-
"k8s.io/api": "atlas_kubernetes_team",
48-
"k8s.io/apimachinery": "atlas_kubernetes_team",
49-
"k8s.io/apiserver": "atlas_kubernetes_team",
50-
"k8s.io/client-go": "atlas_kubernetes_team",
51-
"k8s.io/apiextensions-apiserver": "atlas_kubernetes_team",
52-
"sigs.k8s.io/yaml": "atlas_kubernetes_team",
53-
"sigs.k8s.io/controller-runtime": "atlas_kubernetes_team",
54-
"sigs.k8s.io/kind": "atlas_kubernetes_team",
55-
"golang.org/x/exp": "atlas_kubernetes_team",
56-
"github.com/denisbrodbeck/machineid": "apix-2",
57-
"github.com/shirou/gopsutil/v4": "apix-2",
58-
"go.opentelemetry.io/otel": "apix-2",
59-
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc": "apix-2",
60-
"go.opentelemetry.io/otel/sdk": "apix-2",
61-
"go.opentelemetry.io/otel/trace": "apix-2",
62-
"google.golang.org/grpc": "apix-2",
63-
"github.com/mholt/archives": "apix-2"
2+
"cloud.google.com/go/kms": "apix-2",
3+
"github.com/AlecAivazis/survey/v2": "apix-2",
4+
"github.com/aws/aws-sdk-go-v2": "apix-2",
5+
"github.com/aws/aws-sdk-go-v2/config": "apix-2",
6+
"github.com/aws/aws-sdk-go-v2/credentials": "apix-2",
7+
"github.com/aws/aws-sdk-go-v2/service/kms": "apix-2",
8+
"github.com/Azure/azure-sdk-for-go/sdk/azcore": "apix-2",
9+
"github.com/Azure/azure-sdk-for-go/sdk/azidentity": "apix-2",
10+
"github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys": "apix-2",
11+
"github.com/briandowns/spinner": "apix-2",
12+
"github.com/creack/pty": "apix-2",
13+
"github.com/denisbrodbeck/machineid": "apix-2",
14+
"github.com/evergreen-ci/shrub": "apix-2",
15+
"github.com/go-test/deep": "apix-2",
16+
"github.com/golang-jwt/jwt/v4": "apix-2",
17+
"github.com/golang/mock": "apix-2",
18+
"github.com/google/go-github/v61": "apix-2",
19+
"github.com/google/uuid": "atlas_kubernetes_team",
20+
"github.com/hinshun/vt10x": "apix-2",
21+
"github.com/klauspost/compress": "apix-2",
22+
"github.com/Masterminds/semver/v3": "apix-2",
23+
"github.com/mattn/go-isatty": "apix-2",
24+
"github.com/mholt/archives": "apix-2",
25+
"github.com/mongodb-forks/digest": "apix-2",
26+
"github.com/mongodb-labs/cobra2snooty": "apix-2",
27+
"github.com/mongodb/mongodb-atlas-kubernetes/v2": "atlas_kubernetes_team",
28+
"github.com/Netflix/go-expect": "apix-2",
29+
"github.com/PaesslerAG/jsonpath": "apix-2",
30+
"github.com/pelletier/go-toml": "apix-2",
31+
"github.com/pkg/browser": "apix-2",
32+
"github.com/shirou/gopsutil/v4": "apix-2",
33+
"github.com/spf13/afero": "apix-2",
34+
"github.com/spf13/cobra": "apix-2",
35+
"github.com/spf13/pflag": "apix-2",
36+
"github.com/spf13/viper": "apix-2",
37+
"github.com/stretchr/testify": "apix-2",
38+
"github.com/tangzero/inflector": "apix-2",
39+
"go.mongodb.org/atlas-sdk/v20240530005": "apix-2",
40+
"go.mongodb.org/atlas-sdk/v20241113001": "apix-2",
41+
"go.mongodb.org/atlas-sdk/v20241113004": "apix-2",
42+
"go.mongodb.org/atlas": "apix-2",
43+
"go.mongodb.org/mongo-driver": "apix-2",
44+
"go.opentelemetry.io/otel": "apix-2",
45+
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc": "apix-2",
46+
"go.opentelemetry.io/otel/sdk": "apix-2",
47+
"go.opentelemetry.io/otel/trace": "apix-2",
48+
"golang.org/x/exp": "atlas_kubernetes_team",
49+
"golang.org/x/mod": "apix-2",
50+
"golang.org/x/sys": "apix-2",
51+
"golang.org/x/tools": "apix-2",
52+
"google.golang.org/api": "apix-2",
53+
"google.golang.org/grpc": "apix-2",
54+
"google.golang.org/protobuf": "apix-2",
55+
"gopkg.in/yaml.v3": "apix-2",
56+
"k8s.io/api": "atlas_kubernetes_team",
57+
"k8s.io/apiextensions-apiserver": "atlas_kubernetes_team",
58+
"k8s.io/apimachinery": "atlas_kubernetes_team",
59+
"k8s.io/apiserver": "atlas_kubernetes_team",
60+
"k8s.io/client-go": "atlas_kubernetes_team",
61+
"sigs.k8s.io/controller-runtime": "atlas_kubernetes_team",
62+
"sigs.k8s.io/kind": "atlas_kubernetes_team",
63+
"sigs.k8s.io/yaml": "atlas_kubernetes_team"
6464
}

‎go.mod‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ module github.com/mongodb/mongodb-atlas-cli/atlascli
33
go 1.23.1
44

55
require (
6-
cloud.google.com/go/kms v1.20.4
6+
cloud.google.com/go/kms v1.20.5
77
github.com/AlecAivazis/survey/v2 v2.3.7
8-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
8+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
99
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
1010
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.0
1111
github.com/Masterminds/semver/v3 v3.3.1
1212
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
1313
github.com/PaesslerAG/jsonpath v0.1.1
14-
github.com/aws/aws-sdk-go-v2 v1.32.7
15-
github.com/aws/aws-sdk-go-v2/config v1.28.7
16-
github.com/aws/aws-sdk-go-v2/credentials v1.17.48
17-
github.com/aws/aws-sdk-go-v2/service/kms v1.37.8
14+
github.com/aws/aws-sdk-go-v2 v1.32.8
15+
github.com/aws/aws-sdk-go-v2/config v1.28.10
16+
github.com/aws/aws-sdk-go-v2/credentials v1.17.51
17+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.10
1818
github.com/briandowns/spinner v1.23.1
1919
github.com/creack/pty v1.1.24
2020
github.com/denisbrodbeck/machineid v1.0.1
@@ -30,11 +30,11 @@ require (
3030
github.com/mholt/archives v0.1.0
3131
github.com/mongodb-forks/digest v1.1.0
3232
github.com/mongodb-labs/cobra2snooty v0.18.2
33-
github.com/mongodb/mongodb-atlas-kubernetes/v2 v2.6.0
33+
github.com/mongodb/mongodb-atlas-kubernetes/v2 v2.6.1
3434
github.com/pelletier/go-toml v1.9.5
3535
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
3636
github.com/shirou/gopsutil/v4 v4.24.12
37-
github.com/spf13/afero v1.11.0
37+
github.com/spf13/afero v1.12.0
3838
github.com/spf13/cobra v1.8.1
3939
github.com/spf13/pflag v1.0.5
4040
github.com/spf13/viper v1.19.0
@@ -43,7 +43,7 @@ require (
4343
go.mongodb.org/atlas v0.37.0
4444
go.mongodb.org/atlas-sdk/v20240530005 v20240530005.0.0
4545
go.mongodb.org/atlas-sdk/v20241113004 v20241113004.1.0
46-
go.mongodb.org/mongo-driver v1.17.1
46+
go.mongodb.org/mongo-driver v1.17.2
4747
go.opentelemetry.io/otel v1.33.0
4848
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0
4949
go.opentelemetry.io/otel/sdk v1.33.0
@@ -52,16 +52,16 @@ require (
5252
golang.org/x/mod v0.22.0
5353
golang.org/x/sys v0.29.0
5454
golang.org/x/tools v0.29.0
55-
google.golang.org/api v0.214.0
56-
google.golang.org/grpc v1.69.2
57-
google.golang.org/protobuf v1.36.1
55+
google.golang.org/api v0.216.0
56+
google.golang.org/grpc v1.69.4
57+
google.golang.org/protobuf v1.36.2
5858
gopkg.in/yaml.v3 v3.0.1
5959
k8s.io/api v0.32.0
6060
k8s.io/apiextensions-apiserver v0.32.0
6161
k8s.io/apimachinery v0.32.0
6262
k8s.io/apiserver v0.32.0
6363
k8s.io/client-go v0.32.0
64-
sigs.k8s.io/controller-runtime v0.19.3
64+
sigs.k8s.io/controller-runtime v0.19.4
6565
sigs.k8s.io/kind v0.26.0
6666
sigs.k8s.io/yaml v1.4.0
6767
)
@@ -82,15 +82,15 @@ require (
8282
github.com/STARRY-S/zip v0.2.1 // indirect
8383
github.com/alessio/shellescape v1.4.2 // indirect
8484
github.com/andybalholm/brotli v1.1.1 // indirect
85-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
86-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
87-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
85+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
86+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
87+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
8888
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
8989
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
90-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
91-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
92-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
93-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 // indirect
90+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
91+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
92+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
93+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 // indirect
9494
github.com/aws/smithy-go v1.22.1 // indirect
9595
github.com/bodgit/plumbing v1.3.0 // indirect
9696
github.com/bodgit/sevenzip v1.6.0 // indirect
@@ -124,7 +124,7 @@ require (
124124
github.com/google/s2a-go v0.1.8 // indirect
125125
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
126126
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
127-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
127+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
128128
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
129129
github.com/hashicorp/errwrap v1.1.0 // indirect
130130
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -181,14 +181,14 @@ require (
181181
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
182182
golang.org/x/crypto v0.32.0 // indirect
183183
golang.org/x/net v0.34.0 // indirect
184-
golang.org/x/oauth2 v0.24.0 // indirect
184+
golang.org/x/oauth2 v0.25.0 // indirect
185185
golang.org/x/sync v0.10.0 // indirect
186186
golang.org/x/term v0.28.0 // indirect
187187
golang.org/x/text v0.21.0 // indirect
188-
golang.org/x/time v0.8.0 // indirect
188+
golang.org/x/time v0.9.0 // indirect
189189
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
190190
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
191-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
191+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
192192
gopkg.in/inf.v0 v0.9.1 // indirect
193193
gopkg.in/ini.v1 v1.67.0 // indirect
194194
k8s.io/klog/v2 v2.130.1 // indirect

0 commit comments

Comments
 (0)