Skip to content

Commit e24dde1

Browse files
ajanikowajanikow
authored
[Feature] Switch services to Port names (#1196)
1 parent a6c4fc6 commit e24dde1

24 files changed

+574
-289
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
- (Feature) Allow to change Pod Network and PID settings
3434
- (Feature) Pre OOM Abort function
3535
- (Bugfix) Fix ErrorArray String function
36+
- (Feature) Switch services to Port names
3637

3738
## [1.2.20](https://github.com/arangodb/kube-arangodb/tree/1.2.20) (2022-10-25)
3839
- (Feature) Add action progress

‎pkg/apis/shared/constants.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,7 @@ const (
6464
ClusterJWTSecretVolumeMountDir = "/secrets/cluster/jwt"
6565
ExporterJWTVolumeMountDir = "/secrets/exporter/jwt"
6666
MasterJWTSecretVolumeMountDir = "/secrets/master/jwt"
67+
68+
ServerPortName = "server"
69+
ExporterPortName = "exporter"
6770
)

‎pkg/deployment/deployment_affinity_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestEnsurePod_ArangoDB_AntiAffinity(t *testing.T) {
9292
Name: shared.ServerContainerName,
9393
Image: testImage,
9494
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
95-
Ports: createTestPorts(),
95+
Ports: createTestPorts(api.ServerGroupDBServers),
9696
Resources: emptyResources,
9797
VolumeMounts: []core.VolumeMount{
9898
k8sutil.ArangodVolumeMount(),
@@ -154,7 +154,7 @@ func TestEnsurePod_ArangoDB_AntiAffinity(t *testing.T) {
154154
Name: shared.ServerContainerName,
155155
Image: testImage,
156156
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
157-
Ports: createTestPorts(),
157+
Ports: createTestPorts(api.ServerGroupDBServers),
158158
Resources: emptyResources,
159159
VolumeMounts: []core.VolumeMount{
160160
k8sutil.ArangodVolumeMount(),
@@ -219,7 +219,7 @@ func TestEnsurePod_ArangoDB_AntiAffinity(t *testing.T) {
219219
Name: shared.ServerContainerName,
220220
Image: testImage,
221221
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
222-
Ports: createTestPorts(),
222+
Ports: createTestPorts(api.ServerGroupDBServers),
223223
Resources: emptyResources,
224224
VolumeMounts: []core.VolumeMount{
225225
k8sutil.ArangodVolumeMount(),
@@ -289,7 +289,7 @@ func TestEnsurePod_ArangoDB_AntiAffinity(t *testing.T) {
289289
Name: shared.ServerContainerName,
290290
Image: testImage,
291291
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
292-
Ports: createTestPorts(),
292+
Ports: createTestPorts(api.ServerGroupDBServers),
293293
Resources: emptyResources,
294294
VolumeMounts: []core.VolumeMount{
295295
k8sutil.ArangodVolumeMount(),
@@ -368,7 +368,7 @@ func TestEnsurePod_ArangoDB_Affinity(t *testing.T) {
368368
Name: shared.ServerContainerName,
369369
Image: testImage,
370370
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
371-
Ports: createTestPorts(),
371+
Ports: createTestPorts(api.ServerGroupDBServers),
372372
Resources: emptyResources,
373373
VolumeMounts: []core.VolumeMount{
374374
k8sutil.ArangodVolumeMount(),
@@ -433,7 +433,7 @@ func TestEnsurePod_ArangoDB_Affinity(t *testing.T) {
433433
Name: shared.ServerContainerName,
434434
Image: testImage,
435435
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
436-
Ports: createTestPorts(),
436+
Ports: createTestPorts(api.ServerGroupDBServers),
437437
Resources: emptyResources,
438438
VolumeMounts: []core.VolumeMount{
439439
k8sutil.ArangodVolumeMount(),
@@ -501,7 +501,7 @@ func TestEnsurePod_ArangoDB_Affinity(t *testing.T) {
501501
Name: shared.ServerContainerName,
502502
Image: testImage,
503503
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
504-
Ports: createTestPorts(),
504+
Ports: createTestPorts(api.ServerGroupDBServers),
505505
Resources: emptyResources,
506506
VolumeMounts: []core.VolumeMount{
507507
k8sutil.ArangodVolumeMount(),
@@ -574,7 +574,7 @@ func TestEnsurePod_ArangoDB_Affinity(t *testing.T) {
574574
Name: shared.ServerContainerName,
575575
Image: testImage,
576576
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
577-
Ports: createTestPorts(),
577+
Ports: createTestPorts(api.ServerGroupDBServers),
578578
Resources: emptyResources,
579579
VolumeMounts: []core.VolumeMount{
580580
k8sutil.ArangodVolumeMount(),
@@ -655,7 +655,7 @@ func TestEnsurePod_ArangoDB_NodeAffinity(t *testing.T) {
655655
Name: shared.ServerContainerName,
656656
Image: testImage,
657657
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
658-
Ports: createTestPorts(),
658+
Ports: createTestPorts(api.ServerGroupDBServers),
659659
Resources: emptyResources,
660660
VolumeMounts: []core.VolumeMount{
661661
k8sutil.ArangodVolumeMount(),

‎pkg/deployment/deployment_core_test.go‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
6969
Name: shared.ServerContainerName,
7070
Image: testImage,
7171
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
72-
Ports: createTestPorts(),
72+
Ports: createTestPorts(api.ServerGroupAgents),
7373
VolumeMounts: []core.VolumeMount{
7474
k8sutil.ArangodVolumeMount(),
7575
},
@@ -120,7 +120,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
120120
Name: shared.ServerContainerName,
121121
Image: testImage,
122122
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
123-
Ports: createTestPorts(),
123+
Ports: createTestPorts(api.ServerGroupAgents),
124124
VolumeMounts: []core.VolumeMount{
125125
k8sutil.ArangodVolumeMount(),
126126
},
@@ -180,7 +180,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
180180
Name: shared.ServerContainerName,
181181
Image: testImage,
182182
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
183-
Ports: createTestPorts(),
183+
Ports: createTestPorts(api.ServerGroupAgents),
184184
VolumeMounts: []core.VolumeMount{
185185
k8sutil.ArangodVolumeMount(),
186186
},
@@ -237,7 +237,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
237237
Name: shared.ServerContainerName,
238238
Image: testImage,
239239
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
240-
Ports: createTestPorts(),
240+
Ports: createTestPorts(api.ServerGroupAgents),
241241
VolumeMounts: []core.VolumeMount{
242242
k8sutil.ArangodVolumeMount(),
243243
},
@@ -302,7 +302,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
302302
Name: shared.ServerContainerName,
303303
Image: testImage,
304304
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
305-
Ports: createTestPorts(),
305+
Ports: createTestPorts(api.ServerGroupAgents),
306306
VolumeMounts: []core.VolumeMount{
307307
k8sutil.ArangodVolumeMount(),
308308
},
@@ -357,7 +357,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
357357
Name: shared.ServerContainerName,
358358
Image: testImage,
359359
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
360-
Ports: createTestPorts(),
360+
Ports: createTestPorts(api.ServerGroupDBServers),
361361
Resources: k8sutil.ExtractPodResourceRequirement(resourcesUnfiltered),
362362
VolumeMounts: []core.VolumeMount{
363363
k8sutil.ArangodVolumeMount(),
@@ -414,7 +414,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
414414
Name: shared.ServerContainerName,
415415
Image: testImage,
416416
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
417-
Ports: createTestPorts(),
417+
Ports: createTestPorts(api.ServerGroupDBServers),
418418
Resources: k8sutil.ExtractPodResourceRequirement(resourcesUnfiltered),
419419
VolumeMounts: []core.VolumeMount{
420420
k8sutil.ArangodVolumeMount(),
@@ -474,7 +474,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
474474
Name: shared.ServerContainerName,
475475
Image: testImage,
476476
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
477-
Ports: createTestPorts(),
477+
Ports: createTestPorts(api.ServerGroupDBServers),
478478
Resources: k8sutil.ExtractPodResourceRequirement(resourcesUnfiltered),
479479
VolumeMounts: []core.VolumeMount{
480480
k8sutil.ArangodVolumeMount(),
@@ -534,7 +534,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
534534
Name: shared.ServerContainerName,
535535
Image: testImage,
536536
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, false, false),
537-
Ports: createTestPorts(),
537+
Ports: createTestPorts(api.ServerGroupDBServers),
538538
VolumeMounts: []core.VolumeMount{
539539
k8sutil.ArangodVolumeMount(),
540540
},
@@ -586,7 +586,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
586586
Name: shared.ServerContainerName,
587587
Image: testImage,
588588
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
589-
Ports: createTestPorts(),
589+
Ports: createTestPorts(api.ServerGroupAgents),
590590
VolumeMounts: []core.VolumeMount{
591591
k8sutil.ArangodVolumeMount(),
592592
},
@@ -643,7 +643,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
643643
Name: shared.ServerContainerName,
644644
Image: testImage,
645645
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, false),
646-
Ports: createTestPorts(),
646+
Ports: createTestPorts(api.ServerGroupAgents),
647647
VolumeMounts: []core.VolumeMount{
648648
k8sutil.ArangodVolumeMount(),
649649
},
@@ -695,7 +695,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
695695
Name: shared.ServerContainerName,
696696
Image: testImage,
697697
Command: createTestCommandForAgent(firstAgentStatus.ID, true, false, false),
698-
Ports: createTestPorts(),
698+
Ports: createTestPorts(api.ServerGroupAgents),
699699
VolumeMounts: []core.VolumeMount{
700700
k8sutil.ArangodVolumeMount(),
701701
k8sutil.TlsKeyfileVolumeMount(),
@@ -755,7 +755,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
755755
Name: shared.ServerContainerName,
756756
Image: testImage,
757757
Command: createTestCommandForAgent(firstAgentStatus.ID, false, true, false),
758-
Ports: createTestPorts(),
758+
Ports: createTestPorts(api.ServerGroupAgents),
759759
VolumeMounts: []core.VolumeMount{
760760
k8sutil.ArangodVolumeMount(),
761761
k8sutil.ClusterJWTVolumeMount(),
@@ -816,7 +816,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
816816
Name: shared.ServerContainerName,
817817
Image: testImage,
818818
Command: createTestCommandForAgent(firstAgentStatus.ID, true, true, false),
819-
Ports: createTestPorts(),
819+
Ports: createTestPorts(api.ServerGroupAgents),
820820
ImagePullPolicy: core.PullIfNotPresent,
821821
SecurityContext: securityContext.NewSecurityContext(),
822822
VolumeMounts: []core.VolumeMount{
@@ -873,7 +873,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
873873
Name: shared.ServerContainerName,
874874
Image: testImage,
875875
Command: createTestCommandForAgent(firstAgentStatus.ID, false, false, true),
876-
Ports: createTestPorts(),
876+
Ports: createTestPorts(api.ServerGroupAgents),
877877
VolumeMounts: []core.VolumeMount{
878878
k8sutil.ArangodVolumeMount(),
879879
k8sutil.RocksdbEncryptionVolumeMount(),
@@ -935,7 +935,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
935935
Name: shared.ServerContainerName,
936936
Image: testImage,
937937
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, true, false),
938-
Ports: createTestPorts(),
938+
Ports: createTestPorts(api.ServerGroupDBServers),
939939
VolumeMounts: []core.VolumeMount{
940940
k8sutil.ArangodVolumeMount(),
941941
k8sutil.ClusterJWTVolumeMount(),
@@ -1004,7 +1004,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
10041004
Name: shared.ServerContainerName,
10051005
Image: testImage,
10061006
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, true, false),
1007-
Ports: createTestPorts(),
1007+
Ports: createTestPorts(api.ServerGroupDBServers),
10081008
VolumeMounts: []core.VolumeMount{
10091009
k8sutil.ArangodVolumeMount(),
10101010
k8sutil.ClusterJWTVolumeMount(),
@@ -1076,7 +1076,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
10761076
Name: shared.ServerContainerName,
10771077
Image: testImage,
10781078
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, true, false),
1079-
Ports: createTestPorts(),
1079+
Ports: createTestPorts(api.ServerGroupDBServers),
10801080
VolumeMounts: []core.VolumeMount{
10811081
k8sutil.ArangodVolumeMount(),
10821082
k8sutil.LifecycleVolumeMount(),
@@ -1147,7 +1147,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
11471147
Name: shared.ServerContainerName,
11481148
Image: testImage,
11491149
Command: createTestCommandForDBServer(firstDBServerStatus.ID, false, true, false),
1150-
Ports: createTestPorts(),
1150+
Ports: createTestPorts(api.ServerGroupDBServers),
11511151
VolumeMounts: []core.VolumeMount{
11521152
k8sutil.ArangodVolumeMount(),
11531153
k8sutil.LifecycleVolumeMount(),
@@ -1211,7 +1211,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
12111211
Name: shared.ServerContainerName,
12121212
Image: testImage,
12131213
Command: createTestCommandForCoordinator(firstCoordinatorStatus.ID, true, true),
1214-
Ports: createTestPorts(),
1214+
Ports: createTestPorts(api.ServerGroupCoordinators),
12151215
ImagePullPolicy: core.PullIfNotPresent,
12161216
Resources: emptyResources,
12171217
SecurityContext: securityContext.NewSecurityContext(),
@@ -1277,7 +1277,7 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
12771277
Name: shared.ServerContainerName,
12781278
Image: testImage,
12791279
Command: createTestCommandForSingleMode(true, true),
1280-
Ports: createTestPorts(),
1280+
Ports: createTestPorts(api.ServerGroupSingle),
12811281
ImagePullPolicy: core.PullIfNotPresent,
12821282
SecurityContext: securityContext.NewSecurityContext(),
12831283
VolumeMounts: []core.VolumeMount{

‎pkg/deployment/deployment_encryption_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestEnsurePod_ArangoDB_Encryption(t *testing.T) {
7575
AgentArgsWithTLS(firstAgentStatus.ID, false),
7676
ArgsWithAuth(false),
7777
ArgsWithEncryptionKey()),
78-
Ports: createTestPorts(),
78+
Ports: createTestPorts(api.ServerGroupAgents),
7979
VolumeMounts: []core.VolumeMount{
8080
k8sutil.ArangodVolumeMount(),
8181
k8sutil.RocksdbEncryptionVolumeMount(),
@@ -154,7 +154,7 @@ func TestEnsurePod_ArangoDB_Encryption(t *testing.T) {
154154
Name: shared.ServerContainerName,
155155
Image: testImage,
156156
Command: createTestCommandForDBServer(firstDBServerStatus.ID, true, true, true),
157-
Ports: createTestPorts(),
157+
Ports: createTestPorts(api.ServerGroupDBServers),
158158
Lifecycle: createTestLifecycle(api.ServerGroupAgents),
159159
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", shared.ArangoPort),
160160
ImagePullPolicy: core.PullIfNotPresent,
@@ -223,7 +223,7 @@ func TestEnsurePod_ArangoDB_Encryption(t *testing.T) {
223223
AgentArgsWithTLS(firstAgentStatus.ID, false),
224224
ArgsWithAuth(false),
225225
ArgsWithEncryptionKey()),
226-
Ports: createTestPorts(),
226+
Ports: createTestPorts(api.ServerGroupAgents),
227227
VolumeMounts: []core.VolumeMount{
228228
k8sutil.ArangodVolumeMount(),
229229
k8sutil.RocksdbEncryptionVolumeMount(),
@@ -290,7 +290,7 @@ func TestEnsurePod_ArangoDB_Encryption(t *testing.T) {
290290
"rocksdb.encryption-key-rotation": "true",
291291
}
292292
}),
293-
Ports: createTestPorts(),
293+
Ports: createTestPorts(api.ServerGroupAgents),
294294
VolumeMounts: []core.VolumeMount{
295295
k8sutil.ArangodVolumeMount(),
296296
k8sutil.RocksdbEncryptionReadOnlyVolumeMount(),

‎pkg/deployment/deployment_features_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
7272

7373
return args
7474
}),
75-
Ports: createTestPorts(),
75+
Ports: createTestPorts(api.ServerGroupDBServers),
7676
Resources: emptyResources,
7777
VolumeMounts: []core.VolumeMount{
7878
k8sutil.ArangodVolumeMount(),
@@ -135,7 +135,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
135135

136136
return args
137137
}),
138-
Ports: createTestPorts(),
138+
Ports: createTestPorts(api.ServerGroupDBServers),
139139
Resources: emptyResources,
140140
VolumeMounts: []core.VolumeMount{
141141
k8sutil.ArangodVolumeMount(),
@@ -194,7 +194,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
194194

195195
return args
196196
}),
197-
Ports: createTestPorts(),
197+
Ports: createTestPorts(api.ServerGroupDBServers),
198198
Resources: emptyResources,
199199
VolumeMounts: []core.VolumeMount{
200200
k8sutil.ArangodVolumeMount(),
@@ -257,7 +257,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
257257

258258
return args
259259
}),
260-
Ports: createTestPorts(),
260+
Ports: createTestPorts(api.ServerGroupCoordinators),
261261
Resources: emptyResources,
262262
VolumeMounts: []core.VolumeMount{
263263
k8sutil.ArangodVolumeMount(),
@@ -320,7 +320,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
320320

321321
return args
322322
}),
323-
Ports: createTestPorts(),
323+
Ports: createTestPorts(api.ServerGroupCoordinators),
324324
Resources: emptyResources,
325325
VolumeMounts: []core.VolumeMount{
326326
k8sutil.ArangodVolumeMount(),
@@ -382,7 +382,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
382382

383383
return args
384384
}),
385-
Ports: createTestPorts(),
385+
Ports: createTestPorts(api.ServerGroupSingle),
386386
Resources: emptyResources,
387387
VolumeMounts: []core.VolumeMount{
388388
k8sutil.ArangodVolumeMount(),
@@ -447,7 +447,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
447447

448448
return args
449449
}),
450-
Ports: createTestPorts(),
450+
Ports: createTestPorts(api.ServerGroupSingle),
451451
Resources: emptyResources,
452452
VolumeMounts: []core.VolumeMount{
453453
k8sutil.ArangodVolumeMount(),
@@ -512,7 +512,7 @@ func TestEnsurePod_ArangoDB_Features(t *testing.T) {
512512

513513
return args
514514
}),
515-
Ports: createTestPorts(),
515+
Ports: createTestPorts(api.ServerGroupSingle),
516516
Resources: emptyResources,
517517
VolumeMounts: []core.VolumeMount{
518518
k8sutil.ArangodVolumeMount(),

0 commit comments

Comments
 (0)