Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added disableIPV6 Spec entry. #271

Merged
merged 1 commit into from
Oct 22, 2018
Merged

Added disableIPV6 Spec entry. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/Manual/Deployment/Kubernetes/DeploymentResource.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,12 @@ servers.
When not specified, no monitoring token is used.
The default value is empty.

### `spec.ipv6.forbidden: bool`
### `spec.disableIPV6: bool`
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

either ipv6.forbidden, ipv6.disabled or disableIPv6


This setting prevents the use of IPv6 addresses by ArangoDB servers.
The default is `false`.
The default is `false`.

This setting cannot be changed after the deployment has been created.

### `spec.<group>.count: number`

Expand Down
21 changes: 21 additions & 0 deletions pkg/apis/deployment/v1alpha/deployment_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type DeploymentSpec struct {
Image *string `json:"image,omitempty"`
ImagePullPolicy *v1.PullPolicy `json:"imagePullPolicy,omitempty"`
DowntimeAllowed *bool `json:"downtimeAllowed,omitempty"`
DisableIPV6 *bool `json:"disableIPV6,omitempty"`

ExternalAccess ExternalAccessSpec `json:"externalAccess"`
RocksDB RocksDBSpec `json:"rocksdb"`
Expand Down Expand Up @@ -98,6 +99,19 @@ func (s DeploymentSpec) IsDowntimeAllowed() bool {
return util.BoolOrDefault(s.DowntimeAllowed)
}

// IsDisableIPV6 returns the value of disableIPV6.
func (s DeploymentSpec) IsDisableIPV6() bool {
return util.BoolOrDefault(s.DisableIPV6)
}

// GetListenAddr returns "[::]" or "0.0.0.0" depending on IsDisableIPV6
func (s DeploymentSpec) GetListenAddr() string {
if s.IsDisableIPV6() {
return "0.0.0.0"
}
return "[::]"
}

// IsAuthenticated returns true when authentication is enabled
func (s DeploymentSpec) IsAuthenticated() bool {
return s.Authentication.IsAuthenticated()
Expand Down Expand Up @@ -180,6 +194,9 @@ func (s *DeploymentSpec) SetDefaultsFrom(source DeploymentSpec) {
if s.DowntimeAllowed == nil {
s.DowntimeAllowed = util.NewBoolOrNil(source.DowntimeAllowed)
}
if s.DisableIPV6 == nil {
s.DisableIPV6 = util.NewBoolOrNil(source.DisableIPV6)
}
s.ExternalAccess.SetDefaultsFrom(source.ExternalAccess)
s.RocksDB.SetDefaultsFrom(source.RocksDB)
s.Authentication.SetDefaultsFrom(source.Authentication)
Expand Down Expand Up @@ -269,6 +286,10 @@ func (s DeploymentSpec) ResetImmutableFields(target *DeploymentSpec) []string {
target.StorageEngine = NewStorageEngineOrNil(s.StorageEngine)
resetFields = append(resetFields, "storageEngine")
}
if s.IsDisableIPV6() != target.IsDisableIPV6() {
target.DisableIPV6 = util.NewBoolOrNil(s.DisableIPV6)
resetFields = append(resetFields, "disableIPV6")
}
if l := s.ExternalAccess.ResetImmutableFields("externalAccess", &target.ExternalAccess); l != nil {
resetFields = append(resetFields, l...)
}
Expand Down
7 changes: 7 additions & 0 deletions pkg/apis/deployment/v1alpha/deployment_spec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ func TestDeploymentSpecResetImmutableFields(t *testing.T) {
true,
[]string{"mode", "agents.count"},
},
{
DeploymentSpec{DisableIPV6: util.NewBool(false)},
DeploymentSpec{DisableIPV6: util.NewBool(true)},
DeploymentSpec{DisableIPV6: util.NewBool(false)},
false,
[]string{"disableIPV6"},
},
}

for _, test := range tests {
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/deployment/v1alpha/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/deployment/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (ib *imagesBuilder) fetchArangoDBImageIDAndVersion(ctx context.Context, ima
// Pod cannot be fetched, ensure it is created
args := []string{
"--server.authentication=false",
fmt.Sprintf("--server.endpoint=tcp://[::]:%d", k8sutil.ArangoPort),
fmt.Sprintf("--server.endpoint=tcp://%s:%d", ib.Spec.GetListenAddr(), k8sutil.ArangoPort),
"--database.directory=" + k8sutil.ArangodVolumeMountDir,
"--log.output=+",
}
Expand Down
7 changes: 1 addition & 6 deletions pkg/deployment/resources/pod_creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,13 @@ func createArangodArgs(apiObject metav1.Object, deplSpec api.DeploymentSpec, gro
options := make([]optionPair, 0, 64)
svrSpec := deplSpec.GetServerGroupSpec(group)

// Endpoint
listenAddr := "[::]"
/* if apiObject.Spec.Di.DisableIPv6 {
listenAddr = "0.0.0.0"
}*/
//scheme := NewURLSchemes(bsCfg.SslKeyFile != "").Arangod
scheme := "tcp"
if deplSpec.IsSecure() {
scheme = "ssl"
}
options = append(options,
optionPair{"--server.endpoint", fmt.Sprintf("%s://%s:%d", scheme, listenAddr, k8sutil.ArangoPort)},
optionPair{"--server.endpoint", fmt.Sprintf("%s://%s:%d", scheme, deplSpec.GetListenAddr(), k8sutil.ArangoPort)},
)

// Authentication
Expand Down