Merge pull request buildpacks-community#1205 from pivotal/clusterbuildpack-inline-image

Daniel Chen · web-flow · commit b6eb123bfb19 · 2023-05-09T16:58:58.000-04:00
Inline the `image` field for ClusterBuildpack
diff --git a/pkg/apis/build/v1alpha2/cluster_buildpack_types.go b/pkg/apis/build/v1alpha2/cluster_buildpack_types.go
@@ -29,7 +29,7 @@ type ClusterBuildpack struct {
 // +k8s:openapi-gen=true
 type ClusterBuildpackSpec struct {
 	// +listType
-	corev1alpha1.ImageSource `json:"source,omitempty"`
+	corev1alpha1.ImageSource `json:",inline"`
 	ServiceAccountRef        *corev1.ObjectReference `json:"serviceAccountRef,omitempty"`
 }
 
diff --git a/pkg/apis/build/v1alpha2/cluster_buildpack_validation.go b/pkg/apis/build/v1alpha2/cluster_buildpack_validation.go
@@ -24,5 +24,5 @@ func (s *ClusterBuildpackSpec) Validate(ctx context.Context) *apis.FieldError {
 		}
 	}
 
-	return validate.Image(s.Image).ViaField()
+	return validate.Image(s.Image)
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type ClusterBuildpack struct {`
`29`	`29`	`// +k8s:openapi-gen=true`
`30`	`30`	`type ClusterBuildpackSpec struct {`
`31`	`31`	`// +listType`
`32`		- corev1alpha1.ImageSource `json:"source,omitempty"`
	`32`	+ corev1alpha1.ImageSource `json:",inline"`
`33`	`33`	ServiceAccountRef *corev1.ObjectReference `json:"serviceAccountRef,omitempty"`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ func (s ClusterBuildpackSpec) Validate(ctx context.Context) apis.FieldError {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- return validate.Image(s.Image).ViaField()`
	`27`	`+ return validate.Image(s.Image)`
`28`	`28`	`}`