Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ func (m *MetricsServiceMonitorSpec) IsEnabled() bool {
}

func (m *MetricsServiceMonitorSpec) GetLabels(def map[string]string) map[string]string {
if m == nil {
return def
}

if len(m.Labels) == 0 {
return def
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/deployment/v1/deployment_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,9 @@ func (s DeploymentSpec) IsDisableIPv6() bool {
return util.BoolOrDefault(s.DisableIPv6)
}

// IsNetworkAttachedVolumes returns the value of networkAttachedVolumes, default false
// IsNetworkAttachedVolumes returns the value of networkAttachedVolumes, default true
func (s DeploymentSpec) IsNetworkAttachedVolumes() bool {
return util.BoolOrDefault(s.NetworkAttachedVolumes, false)
return util.BoolOrDefault(s.NetworkAttachedVolumes, true)
}

// GetListenAddr returns "[::]" or "0.0.0.0" depending on IsDisableIPv6
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/deployment/v1/zz_generated.deepcopy.go

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

Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ func (m *MetricsServiceMonitorSpec) IsEnabled() bool {
}

func (m *MetricsServiceMonitorSpec) GetLabels(def map[string]string) map[string]string {
if m == nil {
return def
}

if len(m.Labels) == 0 {
return def
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/deployment/v2alpha1/deployment_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,9 @@ func (s DeploymentSpec) IsDisableIPv6() bool {
return util.BoolOrDefault(s.DisableIPv6)
}

// IsNetworkAttachedVolumes returns the value of networkAttachedVolumes, default false
// IsNetworkAttachedVolumes returns the value of networkAttachedVolumes, default true
func (s DeploymentSpec) IsNetworkAttachedVolumes() bool {
return util.BoolOrDefault(s.NetworkAttachedVolumes, false)
return util.BoolOrDefault(s.NetworkAttachedVolumes, true)
}

// GetListenAddr returns "[::]" or "0.0.0.0" depending on IsDisableIPv6
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/deployment/v2alpha1/server_group_spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ type ServerGroupProbesSpec struct {
ReadinessProbeDisabled *bool `json:"readinessProbeDisabled,omitempty"`
// ReadinessProbeSpec override readiness probe configuration
ReadinessProbeSpec *ServerGroupProbeSpec `json:"readinessProbeSpec,omitempty"`

// StartupProbeDisabled if true startupProbes are disabled
StartupProbeDisabled *bool `json:"startupProbeDisabled,omitempty"`
// StartupProbeSpec override startup probe configuration
StartupProbeSpec *ServerGroupProbeSpec `json:"startupProbeSpec,omitempty"`
}

// GetReadinessProbeDisabled returns in proper manner readiness probe flag with backward compatibility.
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/deployment/v2alpha1/zz_generated.deepcopy.go

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

5 changes: 2 additions & 3 deletions pkg/deployment/rotation/arangod_containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ func containersCompare(_ api.DeploymentSpec, _ api.ServerGroup, spec, status *co

if !equality.Semantic.DeepEqual(ac.Env, bc.Env) {
if areEnvsEqual(ac.Env, bc.Env, func(a, b map[string]core.EnvVar) (map[string]core.EnvVar, map[string]core.EnvVar) {
if _, ok := a[topology.ArangoDBZone]; !ok {
delete(b, topology.ArangoDBZone)
}
delete(a, topology.ArangoDBZone)
delete(b, topology.ArangoDBZone)

return a, b
}) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/deployment/rotation/arangod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func Test_ArangoD_Envs_Zone(t *testing.T) {
c.Env = []core.EnvVar{}
})),

expectedMode: GracefulRotation,
expectedMode: SilentRotation,
},
{
name: "Update Zone env",
Expand All @@ -293,7 +293,7 @@ func Test_ArangoD_Envs_Zone(t *testing.T) {
}
})),

expectedMode: GracefulRotation,
expectedMode: SilentRotation,
},
{
name: "Update other env",
Expand Down