diff --git a/deploy/crds/shipwright.io_buildruns.yaml b/deploy/crds/shipwright.io_buildruns.yaml index 7c20b53880..867a196d03 100644 --- a/deploy/crds/shipwright.io_buildruns.yaml +++ b/deploy/crds/shipwright.io_buildruns.yaml @@ -6593,9 +6593,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. @@ -10460,9 +10457,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 index a467b4b339..38327c434c 100644 --- a/deploy/crds/shipwright.io_builds.yaml +++ b/deploy/crds/shipwright.io_builds.yaml @@ -455,9 +455,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. @@ -2463,9 +2460,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 index a611063cb7..7417e94060 100644 --- 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 index 3bcf80fe2f..1997a63f65 100644 --- 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 index 45d8944afc..47062397a2 100644 --- a/pkg/apis/build/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/build/v1beta1/zz_generated.deepcopy.go @@ -1139,11 +1139,6 @@ func (in *Strategy) DeepCopyInto(out *Strategy) { *out = new(BuildStrategyKind) **out = **in } - if in.APIVersion != nil { - in, out := &in.APIVersion, &out.APIVersion - *out = new(string) - **out = **in - } return }