Skip to content

Commit 14948f0

Browse files
leo-rileo-ri
authored
CLOUDP-95652 Additional multiregional tests (#296)
1 parent b57b325 commit 14948f0

8 files changed

+141
-11
lines changed

‎scripts/create_kind_cluster.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,14 @@ nodes:
7777
hostPort: 30011
7878
listenAddress: "0.0.0.0"
7979
protocol: TCP
80+
- containerPort: 30012
81+
hostPort: 30012
82+
listenAddress: "0.0.0.0"
83+
protocol: TCP
84+
- containerPort: 30013
85+
hostPort: 30013
86+
listenAddress: "0.0.0.0"
87+
protocol: TCP
8088
EOF
8189

8290
# connect the registry to the cluster network

‎test/e2e/config/kind.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,11 @@ nodes:
5353
hostPort: 30011
5454
listenAddress: "0.0.0.0"
5555
protocol: TCP
56-
56+
- containerPort: 30012
57+
hostPort: 30012
58+
listenAddress: "0.0.0.0"
59+
protocol: TCP
60+
- containerPort: 30013
61+
hostPort: 30013
62+
listenAddress: "0.0.0.0"
63+
protocol: TCP

‎test/e2e/configuration_test.go‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ var _ = Describe("[cluster-ns] Configuration namespaced. Deploy cluster", func()
9292
},
9393
),
9494
),
95-
Entry("Multiregion, Backup and 2 DBUsers",
95+
Entry("Multiregion AWS, Backup and 2 DBUsers",
9696
model.NewTestDataProvider(
97-
"operator-ns-multiregion",
97+
"operator-ns-multiregion-aws",
9898
model.NewEmptyAtlasKeyType().UseDefaulFullAccess(),
99-
[]string{"data/atlascluster_multiregion.yaml"},
100-
[]string{"data/atlascluster_multiregion_update.yaml"},
99+
[]string{"data/atlascluster_multiregion_aws.yaml"},
100+
[]string{"data/atlascluster_multiregion_aws_update.yaml"},
101101
[]model.DBUser{
102102
*model.NewDBUser("user1").
103103
WithSecretRef("dbuser-secret-u1").
@@ -114,6 +114,40 @@ var _ = Describe("[cluster-ns] Configuration namespaced. Deploy cluster", func()
114114
},
115115
),
116116
),
117+
Entry("Multiregion Azure, Backup and 1 DBUser",
118+
model.NewTestDataProvider(
119+
"operator-multiregion-azure",
120+
model.NewEmptyAtlasKeyType().UseDefaulFullAccess().CreateAsGlobalLevelKey(),
121+
[]string{"data/atlascluster_multiregion_azure.yaml"},
122+
[]string{},
123+
[]model.DBUser{
124+
*model.NewDBUser("user1").
125+
WithSecretRef("dbuser-secret-u1").
126+
AddBuildInAdminRole(),
127+
},
128+
30012,
129+
[]func(*model.TestDataProvider){
130+
actions.DeleteFirstUser,
131+
},
132+
),
133+
),
134+
Entry("Multiregion GCP, Backup and 1 DBUser",
135+
model.NewTestDataProvider(
136+
"operator-multiregion-gcp",
137+
model.NewEmptyAtlasKeyType().UseDefaulFullAccess().CreateAsGlobalLevelKey(),
138+
[]string{"data/atlascluster_multiregion_gcp.yaml"},
139+
[]string{},
140+
[]model.DBUser{
141+
*model.NewDBUser("user1").
142+
WithSecretRef("dbuser-secret-u1").
143+
AddBuildInAdminRole(),
144+
},
145+
30013,
146+
[]func(*model.TestDataProvider){
147+
actions.DeleteFirstUser,
148+
},
149+
),
150+
),
117151
Entry("Product Owner - Simplest configuration with ProjectOwner and update cluster to have backup",
118152
model.NewTestDataProvider(
119153
"operator-ns-product-owner",

‎test/e2e/data/atlascluster_multiregion.yaml‎ renamed to ‎test/e2e/data/atlascluster_multiregion_aws.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: atlas.mongodb.com/v1
22
kind: AtlasCluster
33
metadata:
4-
name: atlascluster-multiregion
4+
name: atlascluster-multiregion-aws
55
spec:
6-
name: cluster-multiregion
6+
name: cluster-multiregion-aws
77
projectRef:
88
name: my-project
99
providerBackupEnabled: true
@@ -24,4 +24,4 @@ spec:
2424
analyticsNodes: 0
2525
electableNodes: 2
2626
priority: 7
27-
readOnlyNodes: 0
27+
readOnlyNodes: 0

‎test/e2e/data/atlascluster_multiregion_update.yaml‎ renamed to ‎test/e2e/data/atlascluster_multiregion_aws_update.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: atlas.mongodb.com/v1
22
kind: AtlasCluster
33
metadata:
4-
name: atlascluster-multiregion
4+
name: atlascluster-multiregion-aws
55
spec:
6-
name: cluster-multiregion
6+
name: cluster-multiregion-aws
77
projectRef:
88
name: my-project
99
providerBackupEnabled: false
@@ -24,4 +24,4 @@ spec:
2424
analyticsNodes: 0
2525
electableNodes: 2
2626
priority: 7
27-
readOnlyNodes: 0
27+
readOnlyNodes: 0

‎test/e2e/data/atlascluster_multiregion_azure.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
apiVersion: atlas.mongodb.com/v1
2+
kind: AtlasCluster
3+
metadata:
4+
name: atlascluster-multiregion-azure
5+
spec:
6+
name: cluster-multiregion-azure
7+
projectRef:
8+
name: my-project
9+
providerBackupEnabled: true
10+
clusterType: REPLICASET
11+
providerSettings:
12+
instanceSizeName: M10
13+
providerName: AZURE
14+
replicationSpecs:
15+
- numShards: 1
16+
zoneName: Europe
17+
regionsConfig:
18+
NORWAY_EAST:
19+
analyticsNodes: 0
20+
electableNodes: 1
21+
priority: 6
22+
readOnlyNodes: 0
23+
GERMANY_NORTH:
24+
analyticsNodes: 0
25+
electableNodes: 2
26+
priority: 7
27+
readOnlyNodes: 0

‎test/e2e/data/atlascluster_multiregion_azure_update.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
apiVersion: atlas.mongodb.com/v1
2+
kind: AtlasCluster
3+
metadata:
4+
name: atlascluster-multiregion-azure
5+
spec:
6+
name: cluster-multiregion-azure
7+
projectRef:
8+
name: my-project
9+
providerBackupEnabled: true
10+
clusterType: REPLICASET
11+
providerSettings:
12+
instanceSizeName: M20
13+
providerName: AZURE
14+
replicationSpecs:
15+
- numShards: 1
16+
zoneName: Europe
17+
regionsConfig:
18+
NORWAY_EAST:
19+
analyticsNodes: 0
20+
electableNodes: 1
21+
priority: 6
22+
readOnlyNodes: 0
23+
GERMANY_NORTH:
24+
analyticsNodes: 0
25+
electableNodes: 2
26+
priority: 7
27+
readOnlyNodes: 0

‎test/e2e/data/atlascluster_multiregion_gcp.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
apiVersion: atlas.mongodb.com/v1
2+
kind: AtlasCluster
3+
metadata:
4+
name: atlascluster-multiregion-gcp
5+
spec:
6+
name: cluster-multiregion-gcp
7+
projectRef:
8+
name: my-project
9+
providerBackupEnabled: true
10+
clusterType: REPLICASET
11+
providerSettings:
12+
instanceSizeName: M10
13+
providerName: GCP
14+
replicationSpecs:
15+
- numShards: 1
16+
zoneName: US-Zone
17+
regionsConfig:
18+
CENTRAL_US:
19+
analyticsNodes: 0
20+
electableNodes: 1
21+
priority: 6
22+
readOnlyNodes: 0
23+
EASTERN_US:
24+
analyticsNodes: 0
25+
electableNodes: 2
26+
priority: 7
27+
readOnlyNodes: 0

0 commit comments

Comments
 (0)