Skip to content

Commit f9b9670

Browse files
ajanikowajanikow
authored
Revert "[Feature] Finalization of 1.1.0 (#633)" (#635)
1 parent a13b5bb commit f9b9670

File tree

7 files changed

+12
-68
lines changed

7 files changed

+12
-68
lines changed

‎CHANGELOG.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Change Log
22

33
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
4-
- Change NumberOfCores and MemoryOverride flags to be set to true by default
5-
- Enable by default and promote to Production Ready - JWT Rotation Feature, TLS Rotation Feature
64

75
## [1.0.7](https://github.com/arangodb/kube-arangodb/tree/1.0.7) (2020-09-09)
86
- Always use JWT Authorized requests in internal communication

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ Feature-wise production readiness table:
7777
| Operator Single Mode | 1.0.4 | Any | Community, Enterprise | Production | False | --mode.single | Only 1 instance of Operator allowed in namespace when feature is enabled |
7878
| TLS SNI Support | 1.0.3 | >= 3.7.0 | Enterprise | Production | True | --deployment.feature.tls-sni | N/A |
7979
| TLS Runtime Rotation Support | 1.0.4 | > 3.7.0 | Enterprise | Alpha | False | --deployment.feature.tls-rotation | N/A |
80-
| TLS Runtime Rotation Support | 1.1.0 | > 3.7.0 | Enterprise | Production | True | --deployment.feature.tls-rotation | N/A |
8180
| JWT Rotation Support | 1.0.4 | > 3.7.0 | Enterprise | Alpha | False | --deployment.feature.jwt-rotation | N/A |
82-
| JWT Rotation Support | 1.1.0 | > 3.7.0 | Enterprise | Production | True | --deployment.feature.jwt-rotation | N/A |
8381
| Encryption Key Rotation Support | 1.0.4 | > 3.7.0 | Enterprise | Alpha | False | --deployment.feature.encryption-rotation | N/A |
8482
| Operator Maintenance Management Support | 1.0.7 | >= 3.5.0 | Community, Enterprise | Alpha | False | --deployment.feature.maintenance | N/A |
8583

‎pkg/apis/deployment/v1/server_group_spec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func (s ServerGroupSpec) GetProbesSpec() ServerGroupProbesSpec {
373373
// GetOverrideDetectedTotalMemory returns OverrideDetectedTotalMemory with default value (false)
374374
func (s ServerGroupSpec) GetOverrideDetectedTotalMemory() bool {
375375
if s.OverrideDetectedTotalMemory == nil {
376-
return true
376+
return false
377377
}
378378

379379
return *s.OverrideDetectedTotalMemory
@@ -382,7 +382,7 @@ func (s ServerGroupSpec) GetOverrideDetectedTotalMemory() bool {
382382
// OverrideDetectedNumberOfCores returns OverrideDetectedNumberOfCores with default value (false)
383383
func (s ServerGroupSpec) GetOverrideDetectedNumberOfCores() bool {
384384
if s.OverrideDetectedNumberOfCores == nil {
385-
return true
385+
return false
386386
}
387387

388388
return *s.OverrideDetectedNumberOfCores

‎pkg/deployment/deployment_core_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
367367
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", k8sutil.ArangoPort),
368368
ImagePullPolicy: core.PullIfNotPresent,
369369
SecurityContext: securityContext.NewSecurityContext(),
370-
Env: withDefaultEnvs(t, resourcesUnfiltered),
371370
},
372371
},
373372
RestartPolicy: core.RestartPolicyNever,
@@ -424,7 +423,6 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
424423
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", k8sutil.ArangoPort),
425424
ImagePullPolicy: core.PullIfNotPresent,
426425
SecurityContext: securityContext.NewSecurityContext(),
427-
Env: withDefaultEnvs(t, resourcesUnfiltered),
428426
},
429427
},
430428
RestartPolicy: core.RestartPolicyNever,
@@ -482,7 +480,6 @@ func TestEnsurePod_ArangoDB_Core(t *testing.T) {
482480
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", k8sutil.ArangoPort),
483481
ImagePullPolicy: core.PullIfNotPresent,
484482
SecurityContext: securityContext.NewSecurityContext(),
485-
Env: withDefaultEnvs(t, resourcesUnfiltered),
486483
},
487484
},
488485
RestartPolicy: core.RestartPolicyNever,

‎pkg/deployment/deployment_pod_resources_test.go‎

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -35,63 +35,13 @@ import (
3535
core "k8s.io/api/core/v1"
3636
)
3737

38-
type envFunc func() []core.EnvVar
39-
40-
func withEnvs(t *testing.T, f ...envFunc) []core.EnvVar {
41-
var e []core.EnvVar
42-
43-
for _, c := range f {
44-
e = append(e, c()...)
45-
}
46-
47-
return e
48-
}
49-
50-
func withDefaultEnvs(t *testing.T, requirements core.ResourceRequirements, f ...envFunc) []core.EnvVar {
51-
var q []envFunc
52-
53-
q = append(q, resourceLimitAsEnv(t, requirements))
54-
55-
q = append(q, f...)
56-
57-
return withEnvs(t, q...)
58-
}
59-
60-
func resourceLimitAsEnv(t *testing.T, requirements core.ResourceRequirements) envFunc {
61-
return func() []core.EnvVar {
62-
var e []core.EnvVar
63-
if _, ok := requirements.Limits[core.ResourceMemory]; ok {
64-
e = append(e, resourceMemoryLimitAsEnv(t, requirements)()...)
65-
}
66-
if _, ok := requirements.Limits[core.ResourceCPU]; ok {
67-
e = append(e, resourceCPULimitAsEnv(t, requirements)()...)
68-
}
69-
return e
70-
}
71-
}
72-
73-
func resourceMemoryLimitAsEnv(t *testing.T, requirements core.ResourceRequirements) envFunc {
38+
func resourceLimitAsEnv(t *testing.T, requirements core.ResourceRequirements) core.EnvVar {
7439
value, ok := requirements.Limits[core.ResourceMemory]
7540
require.True(t, ok)
76-
return func() []core.EnvVar {
77-
return []core.EnvVar{{
78-
Name: resources.ArangoDBOverrideDetectedTotalMemoryEnv,
79-
Value: fmt.Sprintf("%d", value.Value()),
80-
},
81-
}
82-
}
83-
}
8441

85-
func resourceCPULimitAsEnv(t *testing.T, requirements core.ResourceRequirements) envFunc {
86-
value, ok := requirements.Limits[core.ResourceCPU]
87-
require.True(t, ok)
88-
89-
return func() []core.EnvVar {
90-
return []core.EnvVar{{
91-
Name: resources.ArangoDBOverrideDetectedNumberOfCoresEnv,
92-
Value: fmt.Sprintf("%d", value.Value()),
93-
},
94-
}
42+
return core.EnvVar{
43+
Name: resources.ArangoDBOverrideDetectedTotalMemoryEnv,
44+
Value: fmt.Sprintf("%d", value.Value()),
9545
}
9646
}
9747

@@ -141,7 +91,6 @@ func TestEnsurePod_ArangoDB_Resources(t *testing.T) {
14191
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", k8sutil.ArangoPort),
14292
ImagePullPolicy: core.PullIfNotPresent,
14393
SecurityContext: securityContext.NewSecurityContext(),
144-
Env: withDefaultEnvs(t, resourcesUnfiltered),
14594
},
14695
},
14796
RestartPolicy: core.RestartPolicyNever,
@@ -163,7 +112,7 @@ func TestEnsurePod_ArangoDB_Resources(t *testing.T) {
163112
TLS: noTLS,
164113
DBServers: api.ServerGroupSpec{
165114
Resources: resourcesUnfiltered,
166-
OverrideDetectedTotalMemory: util.NewBool(false),
115+
OverrideDetectedTotalMemory: util.NewBool(true),
167116
},
168117
},
169118
},
@@ -196,7 +145,9 @@ func TestEnsurePod_ArangoDB_Resources(t *testing.T) {
196145
VolumeMounts: []core.VolumeMount{
197146
k8sutil.ArangodVolumeMount(),
198147
},
199-
Env: withEnvs(t, resourceCPULimitAsEnv(t, resourcesUnfiltered)),
148+
Env: []core.EnvVar{
149+
resourceLimitAsEnv(t, resourcesUnfiltered),
150+
},
200151
LivenessProbe: createTestLivenessProbe(httpProbe, false, "", k8sutil.ArangoPort),
201152
ImagePullPolicy: core.PullIfNotPresent,
202153
SecurityContext: securityContext.NewSecurityContext(),

‎pkg/deployment/features/jwt.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var jwtRotation = &feature{
3131
description: "JWT Token rotation in runtime",
3232
version: "3.7.0",
3333
enterpriseRequired: true,
34-
enabledByDefault: true,
34+
enabledByDefault: false,
3535
}
3636

3737
func JWTRotation() Feature {

‎pkg/deployment/features/tls.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var tlsRotation Feature = &feature{
3232
description: "TLS Keyfile rotation in runtime",
3333
version: "3.7.0",
3434
enterpriseRequired: true,
35-
enabledByDefault: true,
35+
enabledByDefault: false,
3636
}
3737

3838
func TLSRotation() Feature {

0 commit comments

Comments
 (0)