From 765218fe0bcddedec3344572c3afb2e1bcb6dc8b Mon Sep 17 00:00:00 2001 From: apoorvajagtap Date: Mon, 9 Oct 2023 22:21:36 +0530 Subject: [PATCH] removing Strategy.APIversion --- deploy/crds/shipwright.io_buildruns.yaml | 6 ------ deploy/crds/shipwright.io_builds.yaml | 3 --- pkg/apis/build/v1beta1/build_conversion.go | 10 ++++------ pkg/apis/build/v1beta1/buildstrategy.go | 4 ---- pkg/apis/build/v1beta1/zz_generated.deepcopy.go | 5 ----- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/deploy/crds/shipwright.io_buildruns.yaml b/deploy/crds/shipwright.io_buildruns.yaml index b5542ca4e..3787885b9 100644 --- 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 index d4e3d8e7b..8da54648a 100644 --- 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 index a611063cb..7417e9406 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 3bcf80fe2..1997a63f6 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 45d8944af..47062397a 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 }