Iter

Author: ajanikow

docs/api/ArangoMLExtension.V1Alpha1.md

@@ -76,7 +76,7 @@ Image define image details
 
 ### .spec.deployment.prediction.port
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L31)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L30)</sup>
 
 Port defines on which port the container will be listening for connections
 
@@ -132,7 +132,7 @@ Image define image details
 
 ### .spec.deployment.project.port
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L31)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L30)</sup>
 
 Port defines on which port the container will be listening for connections
 
@@ -180,7 +180,7 @@ Links:
 
 ### .spec.deployment.replicas
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment.go#L33)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment.go#L56)</sup>
 
 Replicas defines the number of replicas running specified components. No replicas created if no components are defined.
 
@@ -250,7 +250,7 @@ Image define image details
 
 ### .spec.deployment.training.port
 
-Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L31)</sup>
+Type: `integer` <sup>[\[ref\]](https://github.com/arangodb/kube-arangodb/blob/1.2.35/pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go#L30)</sup>
 
 Port defines on which port the container will be listening for connections
 

pkg/apis/ml/v1alpha1/extension_spec_deployment.go

@@ -27,6 +27,29 @@ import (
 "github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
+const (
+ArangoMLExtensionSpecDeploymentComponentPrediction = "prediction"
+ArangoMLExtensionSpecDeploymentComponentTraining = "training"
+ArangoMLExtensionSpecDeploymentComponentProject = "project"
+
+ArangoMLExtensionSpecDeploymentComponentPredictionDefaultPort = 16000
+ArangoMLExtensionSpecDeploymentComponentTrainingDefaultPort = 16001
+ArangoMLExtensionSpecDeploymentComponentProjectDefaultPort = 16002
+)
+
+func GetArangoMLExtensionSpecDeploymentComponentDefaultPort(component string) int32 {
+switch component {
+case ArangoMLExtensionSpecDeploymentComponentPrediction:
+return ArangoMLExtensionSpecDeploymentComponentPredictionDefaultPort
+case ArangoMLExtensionSpecDeploymentComponentTraining:
+return ArangoMLExtensionSpecDeploymentComponentTrainingDefaultPort
+case ArangoMLExtensionSpecDeploymentComponentProject:
+return ArangoMLExtensionSpecDeploymentComponentProjectDefaultPort
+}
+
+return 0
+}
+
 type ArangoMLExtensionSpecDeployment struct {
 // Replicas defines the number of replicas running specified components. No replicas created if no components are defined.
 // +doc/default: 1
@@ -87,9 +110,9 @@ func (s *ArangoMLExtensionSpecDeployment) GetComponents() map[string]*ArangoMLEx
 return nil
 }
 return map[string]*ArangoMLExtensionSpecDeploymentComponent{
-"prediction": s.GetPrediction(),
-"training": s.GetTraining(),
-"project": s.GetProject(),
+ArangoMLExtensionSpecDeploymentComponentPrediction: s.GetPrediction(),
+ArangoMLExtensionSpecDeploymentComponentTraining: s.GetTraining(),
+ArangoMLExtensionSpecDeploymentComponentProject: s.GetProject(),
 }
 }
 
@@ -130,12 +153,22 @@ func (s *ArangoMLExtensionSpecDeployment) Validate() error {
 var usedPorts util.List[int32]
 for prefix, component := range s.GetComponents() {
 err := component.Validate()
-errs = append(errs, shared.PrefixResourceErrors(prefix, err))
+if err != nil {
+errs = append(errs, shared.PrefixResourceErrors(prefix, err))
+continue
+}
 if err == nil {
-if usedPorts.IndexOf(component.GetPort()) >= 0 {
-errs = append(errs, shared.PrefixResourceErrors(prefix, errors.Newf("port %d already specified for other component", component.GetPort())))
+port := component.GetPort(GetArangoMLExtensionSpecDeploymentComponentDefaultPort(prefix))
+
+if port == 0 {
+errs = append(errs, shared.PrefixResourceErrors(prefix, errors.Newf("port not defined")))
+continue
+}
+
+if usedPorts.IndexOf(port) >= 0 {
+errs = append(errs, shared.PrefixResourceErrors(prefix, errors.Newf("port %d already specified for other component", port)))
 } else {
-usedPorts.Append(component.GetPort())
+usedPorts.Append(port)
 }
 }
 }

pkg/apis/ml/v1alpha1/extension_spec_deployment_component.go

@@ -23,7 +23,6 @@ package v1alpha1
 import (
 "github.com/arangodb/kube-arangodb/pkg/apis/shared"
 sharedApi "github.com/arangodb/kube-arangodb/pkg/apis/shared/v1"
-"github.com/arangodb/kube-arangodb/pkg/util/errors"
 )
 
 type ArangoMLExtensionSpecDeploymentComponent struct {
@@ -34,9 +33,9 @@ type ArangoMLExtensionSpecDeploymentComponent struct {
 *sharedApi.ContainerTemplate `json:",inline"`
 }
 
-func (s *ArangoMLExtensionSpecDeploymentComponent) GetPort() int32 {
+func (s *ArangoMLExtensionSpecDeploymentComponent) GetPort(def int32) int32 {
 if s == nil || s.Port == nil {
-return 0
+return def
 }
 return *s.Port
 }
@@ -56,10 +55,6 @@ func (s *ArangoMLExtensionSpecDeploymentComponent) Validate() error {
 
 var err []error
 
-if s.GetPort() < 1 {
-err = append(err, shared.PrefixResourceErrors("port", errors.Newf("must be positive")))
-}
-
 err = append(err,
 s.GetContainerTemplate().Validate(),
 )