Merge pull request #1398 from apoorvajagtap/issue_1363_upstream

Removing Strategy.APIversion
shipwright-io · Oct 12, 2023 · 4bd3b46 · 4bd3b46
2 parents 0fa3ffa + 765218f
commit 4bd3b46
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/deploy/crds/shipwright.io_buildruns.yaml b/deploy/crds/shipwright.io_buildruns.yaml
@@ -6732,9 +6732,6 @@ spec:
                         description: Strategy references the BuildStrategy to use
                           to build the container image.
                         properties:
-                          apiVersion:
-                            description: API version of the referent
-                            type: string
                           kind:
                             description: BuildStrategyKind indicates the kind of the
                               buildstrategy, namespaced or cluster scoped.
@@ -10694,9 +10691,6 @@ spec:
                     description: Strategy references the BuildStrategy to use to build
                       the container image.
                     properties:
-                      apiVersion:
-                        description: API version of the referent
-                        type: string
                       kind:
                         description: BuildStrategyKind indicates the kind of the buildstrategy,
                           namespaced or cluster scoped.

diff --git a/deploy/crds/shipwright.io_builds.yaml b/deploy/crds/shipwright.io_builds.yaml
@@ -2508,9 +2508,6 @@ spec:
                 description: Strategy references the BuildStrategy to use to build
                   the container image.
                 properties:
-                  apiVersion:
-                    description: API version of the referent
-                    type: string
                   kind:
                     description: BuildStrategyKind indicates the kind of the buildstrategy,
                       namespaced or cluster scoped.

diff --git a/pkg/apis/build/v1beta1/build_conversion.go b/pkg/apis/build/v1beta1/build_conversion.go
@@ -133,9 +133,8 @@ func (dest *BuildSpec) ConvertFrom(orig *v1alpha1.BuildSpec) error {
 
 	// Handle BuildSpec Strategy
 	dest.Strategy = Strategy{
-		Name:       orig.StrategyName(),
-		Kind:       (*BuildStrategyKind)(orig.Strategy.Kind),
-		APIVersion: orig.Strategy.APIVersion,
+		Name: orig.StrategyName(),
+		Kind: (*BuildStrategyKind)(orig.Strategy.Kind),
 	}
 
 	// Handle BuildSpec ParamValues
@@ -213,9 +212,8 @@ func (dest *BuildSpec) ConvertTo(bs *v1alpha1.BuildSpec) error {
 
 	// Handle BuildSpec Strategy
 	bs.Strategy = v1alpha1.Strategy{
-		Name:       dest.StrategyName(),
-		Kind:       (*v1alpha1.BuildStrategyKind)(dest.Strategy.Kind),
-		APIVersion: dest.Strategy.APIVersion,
+		Name: dest.StrategyName(),
+		Kind: (*v1alpha1.BuildStrategyKind)(dest.Strategy.Kind),
 	}
 
 	// Handle BuildSpec Builder, TODO

diff --git a/pkg/apis/build/v1beta1/buildstrategy.go b/pkg/apis/build/v1beta1/buildstrategy.go
@@ -187,10 +187,6 @@ type Strategy struct {
 
 	// BuildStrategyKind indicates the kind of the buildstrategy, namespaced or cluster scoped.
 	Kind *BuildStrategyKind `json:"kind,omitempty"`
-
-	// API version of the referent
-	// +optional
-	APIVersion *string `json:"apiVersion,omitempty"`
 }
 
 // BuilderStrategy defines the common elements of build strategies

diff --git a/pkg/apis/build/v1beta1/zz_generated.deepcopy.go b/pkg/apis/build/v1beta1/zz_generated.deepcopy.go