Use empty json tags to please controller-gen. (#1181) (#1191)

Co-Authored-By: Jan Schlicht <jan@d2iq.com>
kudobuilder · Dec 17, 2019 · e5361cb · e5361cb
1 parent ef07673
commit e5361cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/apis/kudo/v1beta1/operatorversion_types.go b/pkg/apis/kudo/v1beta1/operatorversion_types.go
@@ -120,9 +120,9 @@ type Task struct {
 // with the same json names as it would become ambiguous for the default parser. We might revisit this approach in the
 // future should this become an issue.
 type TaskSpec struct {
-	ResourceTaskSpec
-	DummyTaskSpec
-	PipeTaskSpec
+	ResourceTaskSpec `json:",inline"`
+	DummyTaskSpec    `json:",inline"`
+	PipeTaskSpec     `json:",inline"`
 }
 
 // ResourceTaskSpec is referencing a list of resources
@@ -185,8 +185,8 @@ func init() {
 // OperatorDependency references a defined operator.
 type OperatorDependency struct {
 	// Name specifies the name of the dependency. Referenced via defaults.config.
-	ReferenceName string `json:"referenceName"`
-	corev1.ObjectReference
+	ReferenceName          string `json:"referenceName"`
+	corev1.ObjectReference `json:",inline"`
 
 	// Version captures the requirements for what versions of the above object
 	// are allowed.

diff --git a/pkg/apis/kudo/v1beta1/test_types.go b/pkg/apis/kudo/v1beta1/test_types.go
@@ -90,7 +90,7 @@ type TestAssert struct {
 type ObjectReference struct {
 	corev1.ObjectReference `json:",inline"`
 	// Labels to match on.
-	Labels map[string]string
+	Labels map[string]string `json:"labels"`
 }
 
 // Command describes a command to run as a part of a test step or suite.