Skip to content

Commit 73a46d4

Browse files
authored
Merge pull request #124 from arangodb/active-failover-rename
BREAKING CHANGE: Deployment mode ResilientSingle renamed to ActiveFailover
2 parents 1bdb54e + 1fd532c commit 73a46d4

17 files changed

+69
-69
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ read the [tutorial](./docs/Manual/Tutorials/Kubernetes/README.md).
1010

1111
The ArangoDB Kubernetes Operator is still in **heavy development**.
1212

13-
Running ArangoDB deployments (single, resilient-single or cluster)
13+
Running ArangoDB deployments (single, active-failover or cluster)
1414
is becoming reasonably stable, but you should **not yet use it for production
1515
environments**.
1616

docs/Manual/Deployment/Kubernetes/DeploymentResource.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ Below you'll find all settings of the `ArangoDeployment` custom resource.
5151
Several settings are for various groups of servers. These are indicated
5252
with `<group>` where `<group>` can be any of:
5353

54-
- `agents` for all agents of a `Cluster` or `ResilientSingle` pair.
54+
- `agents` for all agents of a `Cluster` or `ActiveFailover` pair.
5555
- `dbservers` for all dbservers of a `Cluster`.
5656
- `coordinators` for all coordinators of a `Cluster`.
57-
- `single` for all single servers of a `Single` instance or `ResilientSingle` pair.
57+
- `single` for all single servers of a `Single` instance or `ActiveFailover` pair.
5858
- `syncmasters` for all syncmasters of a `Cluster`.
5959
- `syncworkers` for all syncworkers of a `Cluster`.
6060

@@ -64,7 +64,7 @@ This setting specifies the type of deployment you want to create.
6464
Possible values are:
6565

6666
- `Cluster` (default) Full cluster. Defaults to 3 agents, 3 dbservers & 3 coordinators.
67-
- `ResilientSingle` Resilient single pair. Defaults to 3 agents and 2 single servers.
67+
- `ActiveFailover` Active-failover single pair. Defaults to 3 agents and 2 single servers.
6868
- `Single` Single server only (note this does not provide high availability or reliability).
6969

7070
This setting cannot be changed after the deployment has been created.
@@ -254,7 +254,7 @@ The default is `false`.
254254
This setting specifies the number of servers to start for the given group.
255255
For the agent group, this value must be a positive, odd number.
256256
The default value is `3` for all groups except `single` (there the default is `1`
257-
for `spec.mode: single` and `2` for `spec.mode: resilientsingle`).
257+
for `spec.mode: Single` and `2` for `spec.mode: ActiveFailover`).
258258

259259
For the `syncworkers` group, it is highly recommended to use the same number
260260
as for the `dbservers` group.

pkg/apis/deployment/v1alpha/deployment_mode.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ type DeploymentMode string
3232
const (
3333
// DeploymentModeSingle yields a single server
3434
DeploymentModeSingle DeploymentMode = "Single"
35-
// DeploymentModeResilientSingle yields an agency and a resilient-single server pair
36-
DeploymentModeResilientSingle DeploymentMode = "ResilientSingle"
35+
// DeploymentModeActiveFailover yields an agency and a active-failover server pair
36+
DeploymentModeActiveFailover DeploymentMode = "ActiveFailover"
3737
// DeploymentModeCluster yields an full cluster (agency, dbservers & coordinators)
3838
DeploymentModeCluster DeploymentMode = "Cluster"
3939
)
@@ -42,21 +42,21 @@ const (
4242
// Return errors when validation fails, nil on success.
4343
func (m DeploymentMode) Validate() error {
4444
switch m {
45-
case DeploymentModeSingle, DeploymentModeResilientSingle, DeploymentModeCluster:
45+
case DeploymentModeSingle, DeploymentModeActiveFailover, DeploymentModeCluster:
4646
return nil
4747
default:
4848
return maskAny(errors.Wrapf(ValidationError, "Unknown deployment mode: '%s'", string(m)))
4949
}
5050
}
5151

52-
// HasSingleServers returns true when the given mode is "Single" or "ResilientSingle".
52+
// HasSingleServers returns true when the given mode is "Single" or "ActiveFailover".
5353
func (m DeploymentMode) HasSingleServers() bool {
54-
return m == DeploymentModeSingle || m == DeploymentModeResilientSingle
54+
return m == DeploymentModeSingle || m == DeploymentModeActiveFailover
5555
}
5656

57-
// HasAgents returns true when the given mode is "ResilientSingle" or "Cluster".
57+
// HasAgents returns true when the given mode is "ActiveFailover" or "Cluster".
5858
func (m DeploymentMode) HasAgents() bool {
59-
return m == DeploymentModeResilientSingle || m == DeploymentModeCluster
59+
return m == DeploymentModeActiveFailover || m == DeploymentModeCluster
6060
}
6161

6262
// HasDBServers returns true when the given mode is "Cluster".

pkg/apis/deployment/v1alpha/deployment_mode_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,38 @@ import (
3131
func TestDeploymentModeValidate(t *testing.T) {
3232
// Valid
3333
assert.Nil(t, DeploymentMode("Single").Validate())
34-
assert.Nil(t, DeploymentMode("ResilientSingle").Validate())
34+
assert.Nil(t, DeploymentMode("ActiveFailover").Validate())
3535
assert.Nil(t, DeploymentMode("Cluster").Validate())
3636

3737
// Not valid
3838
assert.Error(t, DeploymentMode("").Validate())
3939
assert.Error(t, DeploymentMode(" cluster").Validate())
4040
assert.Error(t, DeploymentMode("singles").Validate())
4141
assert.Error(t, DeploymentMode("single").Validate())
42-
assert.Error(t, DeploymentMode("resilientsingle").Validate())
42+
assert.Error(t, DeploymentMode("activefailover").Validate())
4343
assert.Error(t, DeploymentMode("cluster").Validate())
4444
}
4545

4646
func TestDeploymentModeHasX(t *testing.T) {
4747
assert.True(t, DeploymentModeSingle.HasSingleServers())
48-
assert.True(t, DeploymentModeResilientSingle.HasSingleServers())
48+
assert.True(t, DeploymentModeActiveFailover.HasSingleServers())
4949
assert.False(t, DeploymentModeCluster.HasSingleServers())
5050

5151
assert.False(t, DeploymentModeSingle.HasAgents())
52-
assert.True(t, DeploymentModeResilientSingle.HasAgents())
52+
assert.True(t, DeploymentModeActiveFailover.HasAgents())
5353
assert.True(t, DeploymentModeCluster.HasAgents())
5454

5555
assert.False(t, DeploymentModeSingle.HasDBServers())
56-
assert.False(t, DeploymentModeResilientSingle.HasDBServers())
56+
assert.False(t, DeploymentModeActiveFailover.HasDBServers())
5757
assert.True(t, DeploymentModeCluster.HasDBServers())
5858

5959
assert.False(t, DeploymentModeSingle.HasCoordinators())
60-
assert.False(t, DeploymentModeResilientSingle.HasCoordinators())
60+
assert.False(t, DeploymentModeActiveFailover.HasCoordinators())
6161
assert.True(t, DeploymentModeCluster.HasCoordinators())
6262
}
6363

6464
func TestDeploymentModeSupportsSync(t *testing.T) {
6565
assert.False(t, DeploymentModeSingle.SupportsSync())
66-
assert.False(t, DeploymentModeResilientSingle.SupportsSync())
66+
assert.False(t, DeploymentModeActiveFailover.SupportsSync())
6767
assert.True(t, DeploymentModeCluster.SupportsSync())
6868
}

pkg/apis/deployment/v1alpha/server_group_spec.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (s ServerGroupSpec) Validate(group ServerGroup, used bool, mode DeploymentM
6464
if env == EnvironmentProduction {
6565
switch group {
6666
case ServerGroupSingle:
67-
if mode == DeploymentModeResilientSingle {
67+
if mode == DeploymentModeActiveFailover {
6868
minCount = 2
6969
}
7070
case ServerGroupAgents:
@@ -93,7 +93,7 @@ func (s *ServerGroupSpec) SetDefaults(group ServerGroup, used bool, mode Deploym
9393
if mode == DeploymentModeSingle {
9494
s.Count = util.NewInt(1) // Single server
9595
} else {
96-
s.Count = util.NewInt(2) // Resilient single
96+
s.Count = util.NewInt(2) // ActiveFailover
9797
}
9898
default:
9999
s.Count = util.NewInt(3)

pkg/apis/deployment/v1alpha/server_group_spec_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ func TestServerGroupSpecValidateCount(t *testing.T) {
3535
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupSingle, false, DeploymentModeCluster, EnvironmentDevelopment))
3636
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentDevelopment))
3737
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentDevelopment))
38-
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentDevelopment))
39-
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentDevelopment))
38+
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentDevelopment))
39+
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentDevelopment))
4040
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentDevelopment))
4141
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(6)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentDevelopment))
4242
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
4343
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
4444
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentProduction))
45-
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentProduction))
45+
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(3)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentProduction))
4646
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentProduction))
4747
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentProduction))
4848
assert.Nil(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupSyncMasters, true, DeploymentModeCluster, EnvironmentProduction))
@@ -51,21 +51,21 @@ func TestServerGroupSpecValidateCount(t *testing.T) {
5151
// Invalid
5252
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupSingle, false, DeploymentModeCluster, EnvironmentDevelopment))
5353
assert.Error(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupSingle, true, DeploymentModeSingle, EnvironmentDevelopment))
54-
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupSingle, true, DeploymentModeResilientSingle, EnvironmentProduction))
54+
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupSingle, true, DeploymentModeActiveFailover, EnvironmentProduction))
5555
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentDevelopment))
56-
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentDevelopment))
56+
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentDevelopment))
5757
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentDevelopment))
5858
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
5959
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupSyncMasters, true, DeploymentModeCluster, EnvironmentDevelopment))
6060
assert.Error(t, ServerGroupSpec{Count: util.NewInt(0)}.Validate(ServerGroupSyncWorkers, true, DeploymentModeCluster, EnvironmentDevelopment))
6161
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentDevelopment))
62-
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentDevelopment))
62+
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentDevelopment))
6363
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentDevelopment))
6464
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
6565
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupSyncMasters, true, DeploymentModeCluster, EnvironmentDevelopment))
6666
assert.Error(t, ServerGroupSpec{Count: util.NewInt(-1)}.Validate(ServerGroupSyncWorkers, true, DeploymentModeCluster, EnvironmentDevelopment))
6767
assert.Error(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupAgents, true, DeploymentModeCluster, EnvironmentProduction))
68-
assert.Error(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupAgents, true, DeploymentModeResilientSingle, EnvironmentProduction))
68+
assert.Error(t, ServerGroupSpec{Count: util.NewInt(2)}.Validate(ServerGroupAgents, true, DeploymentModeActiveFailover, EnvironmentProduction))
6969
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupDBServers, true, DeploymentModeCluster, EnvironmentProduction))
7070
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentProduction))
7171
assert.Error(t, ServerGroupSpec{Count: util.NewInt(1)}.Validate(ServerGroupSyncMasters, true, DeploymentModeCluster, EnvironmentProduction))
@@ -79,27 +79,27 @@ func TestServerGroupSpecDefault(t *testing.T) {
7979
}
8080

8181
assert.Equal(t, 1, def(ServerGroupSpec{}, ServerGroupSingle, true, DeploymentModeSingle).GetCount())
82-
assert.Equal(t, 2, def(ServerGroupSpec{}, ServerGroupSingle, true, DeploymentModeResilientSingle).GetCount())
82+
assert.Equal(t, 2, def(ServerGroupSpec{}, ServerGroupSingle, true, DeploymentModeActiveFailover).GetCount())
8383
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSingle, false, DeploymentModeCluster).GetCount())
8484

8585
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupAgents, false, DeploymentModeSingle).GetCount())
86-
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupAgents, true, DeploymentModeResilientSingle).GetCount())
86+
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupAgents, true, DeploymentModeActiveFailover).GetCount())
8787
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupAgents, true, DeploymentModeCluster).GetCount())
8888

8989
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupDBServers, false, DeploymentModeSingle).GetCount())
90-
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupDBServers, false, DeploymentModeResilientSingle).GetCount())
90+
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupDBServers, false, DeploymentModeActiveFailover).GetCount())
9191
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupDBServers, true, DeploymentModeCluster).GetCount())
9292

9393
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupCoordinators, false, DeploymentModeSingle).GetCount())
94-
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupCoordinators, false, DeploymentModeResilientSingle).GetCount())
94+
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupCoordinators, false, DeploymentModeActiveFailover).GetCount())
9595
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupCoordinators, true, DeploymentModeCluster).GetCount())
9696

9797
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncMasters, false, DeploymentModeSingle).GetCount())
98-
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncMasters, false, DeploymentModeResilientSingle).GetCount())
98+
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncMasters, false, DeploymentModeActiveFailover).GetCount())
9999
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupSyncMasters, true, DeploymentModeCluster).GetCount())
100100

101101
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncWorkers, false, DeploymentModeSingle).GetCount())
102-
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncWorkers, false, DeploymentModeResilientSingle).GetCount())
102+
assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncWorkers, false, DeploymentModeActiveFailover).GetCount())
103103
assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupSyncWorkers, true, DeploymentModeCluster).GetCount())
104104

105105
for _, g := range AllServerGroups {

pkg/apis/deployment/v1alpha/sync_spec_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ func TestSyncSpecValidate(t *testing.T) {
3535
auth := AuthenticationSpec{JWTSecretName: util.NewString("foo")}
3636
tls := TLSSpec{CASecretName: util.NewString("None")}
3737
assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeSingle))
38-
assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeResilientSingle))
38+
assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeActiveFailover))
3939
assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth}.Validate(DeploymentModeCluster))
4040
assert.Nil(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth, TLS: tls, Enabled: util.NewBool(true)}.Validate(DeploymentModeCluster))
4141

4242
// Not valid
4343
assert.Error(t, SyncSpec{Image: util.NewString(""), Authentication: auth}.Validate(DeploymentModeSingle))
44-
assert.Error(t, SyncSpec{Image: util.NewString(""), Authentication: auth}.Validate(DeploymentModeResilientSingle))
44+
assert.Error(t, SyncSpec{Image: util.NewString(""), Authentication: auth}.Validate(DeploymentModeActiveFailover))
4545
assert.Error(t, SyncSpec{Image: util.NewString(""), Authentication: auth}.Validate(DeploymentModeCluster))
4646
assert.Error(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth, TLS: tls, Enabled: util.NewBool(true)}.Validate(DeploymentModeSingle))
47-
assert.Error(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth, TLS: tls, Enabled: util.NewBool(true)}.Validate(DeploymentModeResilientSingle))
47+
assert.Error(t, SyncSpec{Image: util.NewString("foo"), Authentication: auth, TLS: tls, Enabled: util.NewBool(true)}.Validate(DeploymentModeActiveFailover))
4848
}
4949

5050
func TestSyncSpecSetDefaults(t *testing.T) {

pkg/deployment/reconcile/action_wait_for_member_up.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, error)
6969
switch a.actionCtx.GetMode() {
7070
case api.DeploymentModeSingle:
7171
return a.checkProgressSingle(ctx)
72-
case api.DeploymentModeResilientSingle:
72+
case api.DeploymentModeActiveFailover:
7373
if a.action.Group == api.ServerGroupAgents {
7474
return a.checkProgressAgent(ctx)
7575
}

pkg/deployment/reconcile/plan_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func createPlan(log zerolog.Logger, apiObject metav1.Object,
113113
switch spec.GetMode() {
114114
case api.DeploymentModeSingle:
115115
// Never scale down
116-
case api.DeploymentModeResilientSingle:
116+
case api.DeploymentModeActiveFailover:
117117
// Only scale singles
118118
plan = append(plan, createScalePlan(log, status.Members.Single, api.ServerGroupSingle, spec.Single.GetCount())...)
119119
case api.DeploymentModeCluster:

pkg/deployment/reconcile/plan_builder_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ func TestCreatePlanSingleScale(t *testing.T) {
8686
assert.Len(t, newPlan, 0) // Single mode does not scale
8787
}
8888

89-
// TestCreatePlanResilientSingleScale creates a `resilientsingle` deployment to test the creating of scaling plan.
90-
func TestCreatePlanResilientSingleScale(t *testing.T) {
89+
// TestCreatePlanActiveFailoverScale creates a `ActiveFailover` deployment to test the creating of scaling plan.
90+
func TestCreatePlanActiveFailoverScale(t *testing.T) {
9191
getTLSKeyfile := func(group api.ServerGroup, member api.MemberStatus) (string, error) {
9292
return "", maskAny(fmt.Errorf("Not implemented"))
9393
}
9494
log := zerolog.Nop()
9595
spec := api.DeploymentSpec{
96-
Mode: api.NewMode(api.DeploymentModeResilientSingle),
96+
Mode: api.NewMode(api.DeploymentModeActiveFailover),
9797
}
9898
spec.SetDefaults("test")
9999
spec.Single.Count = util.NewInt(2)

pkg/deployment/resources/pod_creator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func createArangodArgs(apiObject metav1.Object, deplSpec api.DeploymentSpec, gro
185185
optionPair{"--foxx.queues", "true"},
186186
optionPair{"--server.statistics", "true"},
187187
)
188-
if deplSpec.GetMode() == api.DeploymentModeResilientSingle {
188+
if deplSpec.GetMode() == api.DeploymentModeActiveFailover {
189189
addAgentEndpoints = true
190190
options = append(options,
191191
optionPair{"--replication.automatic-failover", "true"},

pkg/deployment/resources/pod_creator_single_args_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,15 @@ func TestCreateArangodArgsSingle(t *testing.T) {
202202
)
203203
}
204204

205-
// Resilient single
205+
// ActiveFailover
206206
{
207207
apiObject := &api.ArangoDeployment{
208208
ObjectMeta: metav1.ObjectMeta{
209209
Name: "name",
210210
Namespace: "ns",
211211
},
212212
Spec: api.DeploymentSpec{
213-
Mode: api.NewMode(api.DeploymentModeResilientSingle),
213+
Mode: api.NewMode(api.DeploymentModeActiveFailover),
214214
},
215215
}
216216
apiObject.Spec.SetDefaults("test")

0 commit comments

Comments
 (0)