8000 [Feature] [Scheduler] Merge Strategy (#1721) · arangodb/kube-arangodb@e1e9d3f · GitHub
[go: up one dir, main page]
Skip to content

Commit e1e9d3f

Browse files
ajanikowajanikow
authored
[Feature] [Scheduler] Merge Strategy (#1721)
1 parent 750d632 commit e1e9d3f

18 files changed

+438
-49
lines changed

‎.golangci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ linters-settings:
8181
pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/container/resources
8282
- alias: schedulerIntegrationApi
8383
pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration
84+
- alias: schedulerPolicyApi
85+
pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/policy
8486
- alias: schedulerPodApi
8587
pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/pod
8688
- alias: schedulerPodResourcesApi

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- (Feature) DebugPackage ArangoRoutes
3131
- (Feature) (Scheduler) Add Status Conditions
3232
- (Bugfix) Versioning Alignment
33+
- (Feature) (Scheduler) Merge Strategy
3334

3435
## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)
3536
- (Maintenance) Go 1.22.4 & Kubernetes 1.29.6 libraries

‎Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ update-generated:
452452
"github.com/arangodb/kube-arangodb/pkg/apis" \
453453
"shared:v1 \
454454
scheduler:v1alpha1/container scheduler:v1alpha1/container/resources scheduler:v1alpha1/pod scheduler:v1alpha1/pod/resources \
455-
scheduler:v1beta1/integration scheduler:v1beta1/container scheduler:v1beta1/container/resources scheduler:v1beta1/pod scheduler:v1beta1/pod/resources" \
455+
scheduler:v1beta1/integration scheduler:v1beta1/policy scheduler:v1beta1/container scheduler:v1beta1/container/resources scheduler:v1beta1/pod scheduler:v1beta1/pod/resources" \
456456
--go-header-file "./tools/codegen/boilerplate.go.txt" \
457457
$(VERIFYARGS)
458458

@@ -815,6 +815,7 @@ set-typed-api-version/%:
815815
"$(ROOT)/pkg/handlers/" \
816816
"$(ROOT)/pkg/apis/backup/" \
817817
"$(ROOT)/pkg/apis/networking/" \
818+
"$(ROOT)/pkg/apis/scheduler/" \
818819
"$(ROOT)/pkg/upgrade/" \
819820
| cut -d ':' -f 1 | sort | uniq \
820821
| xargs -n 1 $(SED) -i "s#github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/typed/$*/v[A-Za-z0-9]\+#github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/typed/$*/v$(API_VERSION)#g"
@@ -832,6 +833,7 @@ set-api-version/%:
832833
"$(ROOT)/pkg/handlers/" \
833834
"$(ROOT)/pkg/apis/backup/" \
834835
"$(ROOT)/pkg/apis/networking/" \
836+
"$(ROOT)/pkg/apis/scheduler/" \
835837
"$(ROOT)/pkg/upgrade/" \
836838
| cut -d ':' -f 1 | sort | uniq \
837839
| xargs -n 1 $(SED) -i "s#github.com/arangodb/kube-arangodb/pkg/apis/$*/v[A-Za-z0-9]\+#github.com/arangodb/kube-arangodb/pkg/apis/$*/v$(API_VERSION)#g"
@@ -846,6 +848,7 @@ set-api-version/%:
846848
"$(ROOT)/pkg/handlers/" \
847849
"$(ROOT)/pkg/apis/backup/" \
848850
"$(ROOT)/pkg/apis/networking/" \
851+
"$(ROOT)/pkg/apis/scheduler/" \
849852
"$(ROOT)/pkg/upgrade/" \
850853
| cut -d ':' -f 1 | sort | uniq \
851854
| xargs -n 1 $(SED) -i "s#DatabaseV[A-Za-z0-9]\+()\.#DatabaseV$(API_VERSION)().#g"
@@ -860,6 +863,7 @@ set-api-version/%:
860863
"$(ROOT)/pkg/handlers" \
861864
"$(ROOT)/pkg/apis/backup/" \
862865
"$(ROOT)/pkg/apis/networking/" \
866+
"$(ROOT)/pkg/apis/scheduler/" \
863867
"$(ROOT)/pkg/upgrade/" \
864868
| cut -d ':' -f 1 | sort | uniq \
865869
| xargs -n 1 $(SED) -i "s#ReplicationV[A-Za-z0-9]\+()\.#ReplicationV$(API_VERSION)().#g"

‎docs/api/ArangoDeployment.V1.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3076,7 +3076,7 @@ By default, the image is determined by the operator.
30763076

30773077
### .spec.gateway.sidecar.args
30783078

3079-
Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L50)</sup>
3079+
Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L54)</sup>
30803080

30813081
Arguments to the entrypoint.
30823082
The container image's CMD is used if this is not provided.
@@ -3093,7 +3093,7 @@ Links:
30933093

30943094
### .spec.gateway.sidecar.command
30953095

3096-
Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L40)</sup>
3096+
Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L44)</sup>
30973097

30983098
Entrypoint array. Not executed within a shell.
30993099
The container image's ENTRYPOINT is used if this is not provided.
@@ -3110,7 +3110,7 @@ Links:
31103110

31113111
### .spec.gateway.sidecar.controllerListenPort
31123112

3113-
Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L16)</sup>
3113+
Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L36)</sup>
31143114

31153115
ControllerListenPort defines on which port the sidecar container will be listening for controller requests
31163116

@@ -3168,7 +3168,7 @@ Lifecycle keeps actions that the management system should take in response to co
31683168

31693169
### .spec.gateway.sidecar.listenPort
31703170

3171-
Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L12)</sup>
3171+
Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L32)</sup>
31723172

31733173
ListenPort defines on which port the sidecar container will be listening for connections
31743174

@@ -3188,6 +3188,18 @@ Links:
31883188

31893189
***
31903190

3191+
### .spec.gateway.sidecar.method
3192+
3193+
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/policy/merge.go#L32)</sup>
3194+
3195+
Method defines the merge method
3196+
3197+
Possible Values:
3198+
* `"override"` (default) - Overrides values during configuration merge
3199+
* `"append"` - Appends, if possible, values during configuration merge
3200+
3201+
***
3202+
31913203
### .spec.gateway.sidecar.ports
31923204

31933205
Type: `[]core.ContainerPort` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/networking.go#L39)</sup>
@@ -3258,7 +3270,7 @@ VolumeMounts keeps list of pod volumes to mount into the container's filesystem.
32583270

32593271
### .spec.gateway.sidecar.workingDir
32603272

3261-
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L55)</sup>
3273+
Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L59)</sup>
32623274

32633275
Container's working directory.
32643276
If not specified, the container runtime's default will be used, which

0 commit comments

Comments
 (0)
0