update and rebase

aws-controllers-k8s · Mar 19, 2021 · d0b64cb · d0b64cb
1 parent b22dcb0
commit d0b64cb
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 337 deletions.
diff --git a/apis/v1alpha1/transform_job.go b/apis/v1alpha1/transform_job.go
diff --git a/apis/v1alpha1/types.go b/apis/v1alpha1/types.go
diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml b/config/crd/bases/sagemaker.services.k8s.aws_transformjobs.yaml
@@ -84,15 +84,6 @@ spec:
                 type: object
               modelName:
                 type: string
-              tags:
-                items:
-                  properties:
-                    key:
-                      type: string
-                    value:
-                      type: string
-                  type: object
-                type: array
               transformInput:
                 properties:
                   compressionType:

diff --git a/generator.yaml b/generator.yaml
@@ -187,8 +187,5 @@ ignore:
       - Workteam
     operations:
       - UpdateTrainingJob
-<<<<<<< HEAD
-=======
     shape_names:
       - TagList
->>>>>>> bab6733... endpoint: address failed update scenario