remove streamType field

pkg/apis/acid.zalan.do/v1/crds.go

@@ -664,7 +664,8 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 						Type: "array",
 						Items: &apiextv1.JSONSchemaPropsOrArray{
 							Schema: &apiextv1.JSONSchemaProps{
-								Type: "object",
+								Type:     "object",
+								Required: []string{"database", "tables"},
 								Properties: map[string]apiextv1.JSONSchemaProps{
 									"batchSize": {
 										Type: "integer",
@@ -688,17 +689,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 											},
 										},
 									},
-									"streamType": {
-										Type: "string",
-										Enum: []apiextv1.JSON{
-											{
-												Raw: []byte(`"nakadi"`),
-											},
-											{
-												Raw: []byte(`"wal"`),
-											},
-										},
-									},
 								},
 							},
 						},

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -229,9 +229,8 @@ type ConnectionPooler struct {
 }
 
 type Stream struct {
-	StreamType string            `json:"streamType,omitempty"`
-	Database   string            `json:"database,omitempty"`
-	Tables     map[string]string `json:"tables,omitempty"`
-	Filter     map[string]string `json:"filter,omitempty"`
-	BatchSize  uint32            `json:"batchSize,omitempty"`
+	Database  string            `json:"database"`
+	Tables    map[string]string `json:"tables"`
+	Filter    map[string]string `json:"filter,omitempty"`
+	BatchSize uint32            `json:"batchSize,omitempty"`
 }

pkg/apis/zalando.org/v1alpha1/fabriceventstream.go

@@ -40,12 +40,8 @@ type EventStream struct {
 
 // EventStreamFlow defines the flow characteristics of the event stream
 type EventStreamFlow struct {
-	Type           string `json:"type"`
-	DataTypeColumn string `json:"dataTypeColumn,omitempty"`
-	DataOpColumn   string `json:"dataOpColumn,omitempty"`
-	MetadataColumn string `json:"metadataColumn,omitempty"`
-	DataColumn     string `json:"dataColumn,omitempty"`
-	PayloadColumn  string `json:"payloadColumn,omitempty"`
+	Type          string `json:"type"`
+	PayloadColumn string `json:"payloadColumn,omitempty" defaults:"payload"`
 }
 
 // EventStreamSink defines the target of the event stream
@@ -67,7 +63,7 @@ type EventStreamSource struct {
 // EventStreamTable defines the name and ID column to be used for streaming
 type EventStreamTable struct {
 	Name     string `json:"name"`
-	IDColumn string `json:"idColumn,omitempty"`
+	IDColumn string `json:"idColumn,omitempty" defaults:"id"`
 }
 
 // Connection to be used for allowing the FES operator to connect to a database