fix annotations, which crashs custom job (#1072)

kubeflow · Mar 2, 2020 · 1388f11 · 1388f11
1 parent db5e2e2
commit 1388f11
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 9 deletions.
diff --git a/pkg/apis/controller/common/v1alpha3/common_types.go b/pkg/apis/controller/common/v1alpha3/common_types.go
@@ -23,7 +23,7 @@ import (
 type AlgorithmSpec struct {
 	AlgorithmName string `json:"algorithmName,omitempty"`
 	// Key-value pairs representing settings for suggestion algorithms.
-	AlgorithmSettings []AlgorithmSetting `json:"algorithmSettings"`
+	AlgorithmSettings []AlgorithmSetting `json:"algorithmSettings,omitempty"`
 	EarlyStopping     *EarlyStoppingSpec `json:"earlyStopping,omitempty"`
 }
 

diff --git a/pkg/apis/controller/common/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/controller/common/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/v1alpha3/openapi_generated.go b/pkg/apis/v1alpha3/openapi_generated.go
diff --git a/pkg/apis/v1alpha3/swagger.json b/pkg/apis/v1alpha3/swagger.json
@@ -310,9 +310,6 @@
       }
     },
     "v1alpha3.AlgorithmSpec": {
-      "required": [
-        "algorithmSettings"
-      ],
       "properties": {
         "algorithmName": {
           "type": "string"

diff --git a/pkg/controller.v1alpha3/util/annotations.go b/pkg/controller.v1alpha3/util/annotations.go
@@ -1,16 +1,33 @@
+/*
+
+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.
+*/
+
 package util
 
 import (
 	"fmt"
 
-	suggestionsv1alpha3 "github.com/kubeflow/katib/pkg/apis/controller/suggestions/v1alpha3"
-	"github.com/kubeflow/katib/pkg/controller.v1alpha3/consts"
-	pytorchv1 "github.com/kubeflow/pytorch-operator/pkg/apis/pytorch/v1"
-	tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
 	batchv1 "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+
+	suggestionsv1alpha3 "github.com/kubeflow/katib/pkg/apis/controller/suggestions/v1alpha3"
+	"github.com/kubeflow/katib/pkg/controller.v1alpha3/consts"
+	jobv1alpha3 "github.com/kubeflow/katib/pkg/job/v1alpha3"
+	pytorchv1 "github.com/kubeflow/pytorch-operator/pkg/apis/pytorch/v1"
+	tfv1 "github.com/kubeflow/tf-operator/pkg/apis/tensorflow/v1"
 )
 
 var (
@@ -85,6 +102,10 @@ func TrainingJobAnnotations(desiredJob *unstructured.Unstructured) error {
 		}
 		return nil
 	default:
+		// Annotation appending of custom job can be done in Provider.MutateJob.
+		if _, ok := jobv1alpha3.SupportedJobList[kind]; ok {
+			return nil
+		}
 		return fmt.Errorf("Invalid Katib Training Job kind %v", kind)
 	}