[Feature] [Scheduler] Merge Strategy (#1721)

.golangci.yaml

@@ -81,6 +81,8 @@ linters-settings:
         pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/container/resources
       - alias: schedulerIntegrationApi
         pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration
+      - alias: schedulerPolicyApi
+        pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/policy
       - alias: schedulerPodApi
         pkg: github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/pod
       - alias: schedulerPodResourcesApi

CHANGELOG.md

@@ -30,6 +30,7 @@
 - (Feature) DebugPackage ArangoRoutes
 - (Feature) (Scheduler) Add Status Conditions
 - (Bugfix) Versioning Alignment
+- (Feature) (Scheduler) Merge Strategy
 
 ## [1.2.42](https://github.com/arangodb/kube-arangodb/tree/1.2.42) (2024-07-23)
 - (Maintenance) Go 1.22.4 & Kubernetes 1.29.6 libraries

Makefile

@@ -452,7 +452,7 @@ update-generated:
 			"github.com/arangodb/kube-arangodb/pkg/apis" \
 			"shared:v1 \
 			scheduler:v1alpha1/container scheduler:v1alpha1/container/resources scheduler:v1alpha1/pod scheduler:v1alpha1/pod/resources \
-			scheduler:v1beta1/integration scheduler:v1beta1/container scheduler:v1beta1/container/resources scheduler:v1beta1/pod scheduler:v1beta1/pod/resources" \
+			scheduler:v1beta1/integration scheduler:v1beta1/policy scheduler:v1beta1/container scheduler:v1beta1/container/resources scheduler:v1beta1/pod scheduler:v1beta1/pod/resources" \
 			--go-header-file "./tools/codegen/boilerplate.go.txt" \
 			$(VERIFYARGS)
 
@@ -815,6 +815,7 @@ set-typed-api-version/%:
 	      "$(ROOT)/pkg/handlers/" \
 	      "$(ROOT)/pkg/apis/backup/" \
 	      "$(ROOT)/pkg/apis/networking/" \
+	      "$(ROOT)/pkg/apis/scheduler/" \
 	      "$(ROOT)/pkg/upgrade/" \
 	  | cut -d ':' -f 1 | sort | uniq \
 	  | 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/%:
 	      "$(ROOT)/pkg/handlers/" \
 	      "$(ROOT)/pkg/apis/backup/" \
 	      "$(ROOT)/pkg/apis/networking/" \
+	      "$(ROOT)/pkg/apis/scheduler/" \
 	      "$(ROOT)/pkg/upgrade/" \
 	  | cut -d ':' -f 1 | sort | uniq \
 	  | 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/%:
 	      "$(ROOT)/pkg/handlers/" \
 	      "$(ROOT)/pkg/apis/backup/" \
 	      "$(ROOT)/pkg/apis/networking/" \
+	      "$(ROOT)/pkg/apis/scheduler/" \
 	      "$(ROOT)/pkg/upgrade/" \
 	  | cut -d ':' -f 1 | sort | uniq \
 	  | xargs -n 1 $(SED) -i "s#DatabaseV[A-Za-z0-9]\+()\.#DatabaseV$(API_VERSION)().#g"
@@ -860,6 +863,7 @@ set-api-version/%:
 		  "$(ROOT)/pkg/handlers" \
 		  "$(ROOT)/pkg/apis/backup/" \
 	      "$(ROOT)/pkg/apis/networking/" \
+	      "$(ROOT)/pkg/apis/scheduler/" \
 	      "$(ROOT)/pkg/upgrade/" \
 	  | cut -d ':' -f 1 | sort | uniq \
 	  | xargs -n 1 $(SED) -i "s#ReplicationV[A-Za-z0-9]\+()\.#ReplicationV$(API_VERSION)().#g"

docs/api/ArangoDeployment.V1.md

@@ -3076,7 +3076,7 @@ By default, the image is determined by the operator.
 
 ### .spec.gateway.sidecar.args
 
-Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L50)</sup>
+Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L54)</sup>
 
 Arguments to the entrypoint.
 The container image's CMD is used if this is not provided.
@@ -3093,7 +3093,7 @@ Links:
 
 ### .spec.gateway.sidecar.command
 
-Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L40)</sup>
+Type: `array` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L44)</sup>
 
 Entrypoint array. Not executed within a shell.
 The container image's ENTRYPOINT is used if this is not provided.
@@ -3110,7 +3110,7 @@ Links:
 
 ### .spec.gateway.sidecar.controllerListenPort
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L16)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L36)</sup>
 
 ControllerListenPort defines on which port the sidecar container will be listening for controller requests
 
@@ -3168,7 +3168,7 @@ Lifecycle keeps actions that the management system should take in response to co
 
 ### .spec.gateway.sidecar.listenPort
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L12)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/integration/integration.go#L32)</sup>
 
 ListenPort defines on which port the sidecar container will be listening for connections
 
@@ -3188,6 +3188,18 @@ Links:
 
 ***
 
+### .spec.gateway.sidecar.method
+
+Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/policy/merge.go#L32)</sup>
+
+Method defines the merge method
+
+Possible Values: 
+* `"override"` (default) - Overrides values during configuration merge
+* `"append"` - Appends, if possible, values during configuration merge
+
+***
+
 ### .spec.gateway.sidecar.ports
 
 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.
 
 ### .spec.gateway.sidecar.workingDir
 
-Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L55)</sup>
+Type: `string` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.42/pkg/apis/scheduler/v1beta1/container/resources/core.go#L59)</sup>
 
 Container's working directory.
 If not specified, the container runtime's default will be used, which