remove sqs and a few bugs

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

@@ -664,8 +664,7 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 						Type: "array",
 						Items: &apiextv1.JSONSchemaPropsOrArray{
 							Schema: &apiextv1.JSONSchemaProps{
-								Type:     "object",
-								Required: []string{"streamType"},
+								Type: "object",
 								Properties: map[string]apiextv1.JSONSchemaProps{
 									"batchSize": {
 										Type: "integer",
@@ -681,15 +680,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 											},
 										},
 									},
-									"queueName": {
-										Type: "string",
-									},
-									"sqsArn": {
-										Type: "string",
-									},
-									"sqsFifo": {
-										Type: "boolean",
-									},
 									"tables": {
 										Type: "object",
 										AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
@@ -704,9 +694,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 											{
 												Raw: []byte(`"nakadi"`),
 											},
-											{
-												Raw: []byte(`"sqs"`),
-											},
 											{
 												Raw: []byte(`"wal"`),
 											},

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

@@ -74,7 +74,7 @@ type PostgresSpec struct {
 	ServiceAnnotations    map[string]string           `json:"serviceAnnotations,omitempty"`
 	TLS                   *TLSDescription             `json:"tls,omitempty"`
 	AdditionalVolumes     []AdditionalVolume          `json:"additionalVolumes,omitempty"`
-	Streams               []Stream                    `json:"stream,omitempty"`
+	Streams               []Stream                    `json:"streams,omitempty"`
 
 	// deprecated json tags
 	InitContainersOld       []v1.Container `json:"init_containers,omitempty"`
@@ -229,12 +229,9 @@ type ConnectionPooler struct {
 }
 
 type Stream struct {
-	StreamType string            `json:"streamType"`
+	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"`
-	SqsArn     string            `json:"sqsArn,omitempty"`
-	SqsFifo    bool              `json:"sqsFifo,omitempty"`
-	QueueName  string            `json:"queueName,omitempty"`
 }