[Feature] [Scheduler] Extract Integration (#1723)

pkg/apis/deployment/v1/deployment_spec.go

@@ -262,6 +262,9 @@ type DeploymentSpec struct {
 
 	// Gateway defined main Gateway configuration.
 	Gateway *DeploymentSpecGateway `json:"gateway,omitempty"`
+
+	// Integration defined main Integration configuration.
+	Integration *DeploymentSpecIntegration `json:"integration,omitempty"`
 }
 
 // GetAllowMemberRecreation returns member recreation policy based on group and settings
@@ -582,7 +585,10 @@ func (s *DeploymentSpec) Validate() error {
 		return errors.WithStack(errors.Wrap(err, "spec.architecture"))
 	}
 	if err := s.Gateway.Validate(); err != nil {
-		return errors.WithStack(errors.Wrap(err, "spec.architecture"))
+		return errors.WithStack(errors.Wrap(err, "spec.gateway"))
+	}
+	if err := s.Integration.Validate(); err != nil {
+		return errors.WithStack(errors.Wrap(err, "spec.integration"))
 	}
 	return nil
 }

pkg/apis/deployment/v1/deployment_spec_gateway.go

@@ -21,8 +21,6 @@
 package v1
 
 import (
-	schedulerIntegrationApi "github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration"
-	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
 	"github.com/arangodb/kube-arangodb/pkg/util"
 )
 
@@ -40,9 +38,6 @@ type DeploymentSpecGateway struct {
 	// Image is the image to use for the gateway.
 	// By default, the image is determined by the operator.
 	Image *string `json:"image"`
-
-	// Sidecar define the integration sidecar spec
-	Sidecar *schedulerIntegrationApi.Sidecar `json:"sidecar,omitempty"`
 }
 
 // IsEnabled returns whether the gateway is enabled.
@@ -63,22 +58,9 @@ func (d *DeploymentSpecGateway) IsDynamic() bool {
 	return *d.Dynamic
 }
 
-func (d *DeploymentSpecGateway) GetSidecar() *schedulerIntegrationApi.Sidecar {
-	if d == nil || d.Sidecar == nil {
-		return nil
-	}
-	return d.Sidecar
-}
-
 // Validate the given spec
 func (d *DeploymentSpecGateway) Validate() error {
-	if d == nil {
-		d = &DeploymentSpecGateway{}
-	}
-
-	return shared.WithErrors(
-		shared.PrefixResourceErrors("integrationSidecar", d.GetSidecar().Validate()),
-	)
+	return nil
 }
 
 // GetImage returns the image to use for the gateway.

pkg/apis/deployment/v1/deployment_spec_integration.go

@@ -0,0 +1,49 @@
+//
+// DISCLAIMER
+//
+// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package v1
+
+import (
+	schedulerIntegrationApi "github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration"
+	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
+)
+
+type DeploymentSpecIntegration struct {
+	// Sidecar define the integration sidecar spec
+	Sidecar *schedulerIntegrationApi.Sidecar `json:"sidecar,omitempty"`
+}
+
+func (d *DeploymentSpecIntegration) GetSidecar() *schedulerIntegrationApi.Sidecar {
+	if d == nil || d.Sidecar == nil {
+		return nil
+	}
+	return d.Sidecar
+}
+
+// Validate the given spec
+func (d *DeploymentSpecIntegration) Validate() error {
+	if d == nil {
+		d = &DeploymentSpecIntegration{}
+	}
+
+	return shared.WithErrors(
+		shared.PrefixResourceErrors("sidecar", d.GetSidecar().Validate()),
+	)
+}

pkg/apis/deployment/v2alpha1/deployment_spec.go

@@ -262,6 +262,9 @@ type DeploymentSpec struct {
 
 	// Gateway defined main Gateway configuration.
 	Gateway *DeploymentSpecGateway `json:"gateway,omitempty"`
+
+	// Integration defined main Integration configuration.
+	Integration *DeploymentSpecIntegration `json:"integration,omitempty"`
 }
 
 // GetAllowMemberRecreation returns member recreation policy based on group and settings
@@ -582,7 +585,10 @@ func (s *DeploymentSpec) Validate() error {
 		return errors.WithStack(errors.Wrap(err, "spec.architecture"))
 	}
 	if err := s.Gateway.Validate(); err != nil {
-		return errors.WithStack(errors.Wrap(err, "spec.architecture"))
+		return errors.WithStack(errors.Wrap(err, "spec.gateway"))
+	}
+	if err := s.Integration.Validate(); err != nil {
+		return errors.WithStack(errors.Wrap(err, "spec.integration"))
 	}
 	return nil
 }

pkg/apis/deployment/v2alpha1/deployment_spec_gateway.go

@@ -21,8 +21,6 @@
 package v2alpha1
 
 import (
-	schedulerIntegrationApi "github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration"
-	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
 	"github.com/arangodb/kube-arangodb/pkg/util"
 )
 
@@ -40,9 +38,6 @@ type DeploymentSpecGateway struct {
 	// Image is the image to use for the gateway.
 	// By default, the image is determined by the operator.
 	Image *string `json:"image"`
-
-	// Sidecar define the integration sidecar spec
-	Sidecar *schedulerIntegrationApi.Sidecar `json:"sidecar,omitempty"`
 }
 
 // IsEnabled returns whether the gateway is enabled.
@@ -63,22 +58,9 @@ func (d *DeploymentSpecGateway) IsDynamic() bool {
 	return *d.Dynamic
 }
 
-func (d *DeploymentSpecGateway) GetSidecar() *schedulerIntegrationApi.Sidecar {
-	if d == nil || d.Sidecar == nil {
-		return nil
-	}
-	return d.Sidecar
-}
-
 // Validate the given spec
 func (d *DeploymentSpecGateway) Validate() error {
-	if d == nil {
-		d = &DeploymentSpecGateway{}
-	}
-
-	return shared.WithErrors(
-		shared.PrefixResourceErrors("integrationSidecar", d.GetSidecar().Validate()),
-	)
+	return nil
 }
 
 // GetImage returns the image to use for the gateway.

pkg/apis/deployment/v2alpha1/deployment_spec_integration.go

@@ -0,0 +1,49 @@
+//
+// DISCLAIMER
+//
+// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package v2alpha1
+
+import (
+	schedulerIntegrationApi "github.com/arangodb/kube-arangodb/pkg/apis/scheduler/v1beta1/integration"
+	shared "github.com/arangodb/kube-arangodb/pkg/apis/shared"
+)
+
+type DeploymentSpecIntegration struct {
+	// Sidecar define the integration sidecar spec
+	Sidecar *schedulerIntegrationApi.Sidecar `json:"sidecar,omitempty"`
+}
+
+func (d *DeploymentSpecIntegration) GetSidecar() *schedulerIntegrationApi.Sidecar {
+	if d == nil || d.Sidecar == nil {
+		return nil
+	}
+	return d.Sidecar
+}
+
+// Validate the given spec
+func (d *DeploymentSpecIntegration) Validate() error {
+	if d == nil {
+		d = &DeploymentSpecIntegration{}
+	}
+
+	return shared.WithErrors(
+		shared.PrefixResourceErrors("sidecar", d.GetSidecar().Validate()),
+	)
+}