Merge branch 'master' into pooler-deployment-label-selector-test

.github/workflows/run_e2e.yaml

@@ -0,0 +1,24 @@
+name: ubuntu
+
+on: 
+  pull_request:
+  push:
+    branches:
+    - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-go@v2
+      with:
+          go-version: "^1.15.5"
+    - name: Make dependencies
+      run: make deps
+    - name: Compile
+      run: make linux
+    - name: Run unit tests
+      run: go test ./...
+    - name: Run end-2-end tests
+      run: make e2e

.travis.yml

@@ -1,23 +0,0 @@
-dist: trusty
-sudo: false
-
-branches:
-  only:
-  - master
-
-language: go
-
-go:
-  - "1.14.x"
-
-before_install:
-  - go get github.com/mattn/goveralls
-
-install:
-  - make deps
-
-script:
-  - hack/verify-codegen.sh
-  - travis_wait 20 go test -race -covermode atomic -coverprofile=profile.cov ./pkg/... -v
-  - goveralls -coverprofile=profile.cov -service=travis-ci -v
-  - make e2e

README.md

@@ -1,11 +1,5 @@
 # Postgres Operator
 
-[![Build Status](https://travis-ci.org/zalando/postgres-operator.svg?branch=master)](https://travis-ci.org/zalando/postgres-operator)
-[![Coverage Status](https://coveralls.io/repos/github/zalando/postgres-operator/badge.svg)](https://coveralls.io/github/zalando/postgres-operator)
-[![Go Report Card](https://goreportcard.com/badge/github.com/zalando/postgres-operator)](https://goreportcard.com/report/github.com/zalando/postgres-operator)
-[![GoDoc](https://godoc.org/github.com/zalando/postgres-operator?status.svg)](https://godoc.org/github.com/zalando/postgres-operator)
-[![golangci](https://golangci.com/badges/github.com/zalando/postgres-operator.svg)](https://golangci.com/r/github.com/zalando/postgres-operator)
-
 <img src="docs/diagrams/logo.png" width="200">
 
 The Postgres Operator delivers an easy to run highly-available [PostgreSQL](https://www.postgresql.org/)

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -15,6 +15,8 @@ spec:
     singular: operatorconfiguration
     shortNames:
     - opconfig
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -45,6 +47,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion

charts/postgres-operator/crds/postgresqls.yaml

@@ -15,6 +15,8 @@ spec:
     singular: postgresql
     shortNames:
     - pg
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -57,6 +59,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion
@@ -320,6 +323,7 @@ spec:
                         - "10"
                         - "11"
                         - "12"
+                        - "13"
                     parameters:
                       type: object
                       additionalProperties:

charts/postgres-operator/crds/postgresteams.yaml

@@ -15,6 +15,8 @@ spec:
     singular: postgresteam
     shortNames:
     - pgteam
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -25,6 +27,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion

delivery.yaml

@@ -16,7 +16,7 @@ pipeline:
         - desc: 'Install go'
           cmd: |
             cd /tmp
-            wget -q https://storage.googleapis.com/golang/go1.14.7.linux-amd64.tar.gz -O go.tar.gz
+            wget -q https://storage.googleapis.com/golang/go1.15.5.linux-amd64.tar.gz -O go.tar.gz
             tar -xf go.tar.gz
             mv go /usr/local
             ln -s /usr/local/go/bin/go /usr/bin/go

manifests/operatorconfiguration.crd.yaml

@@ -11,6 +11,8 @@ spec:
     singular: operatorconfiguration
     shortNames:
     - opconfig
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -41,6 +43,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion

manifests/postgresql.crd.yaml

@@ -11,6 +11,8 @@ spec:
     singular: postgresql
     shortNames:
     - pg
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -53,6 +55,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion
@@ -316,6 +319,7 @@ spec:
                         - "10"
                         - "11"
                         - "12"
+                        - "13"
                     parameters:
                       type: object
                       additionalProperties:

manifests/postgresteam.crd.yaml

@@ -11,6 +11,8 @@ spec:
     singular: postgresteam
     shortNames:
     - pgteam
+    categories:
+    - all
   scope: Namespaced
   versions:
   - name: v1
@@ -21,6 +23,7 @@ spec:
     schema:
       openAPIV3Schema:
         type: object
+        x-preserve-unknown-fields: true
         required:
           - kind
           - apiVersion

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

@@ -2,6 +2,7 @@ package v1
 
 import (
 	acidzalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do"
+	"github.com/zalando/postgres-operator/pkg/util"
 	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -111,8 +112,9 @@ var minDisable = -1.0
 // PostgresCRDResourceValidation to check applied manifest parameters
 var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 	OpenAPIV3Schema: &apiextv1.JSONSchemaProps{
-		Type:     "object",
-		Required: []string{"kind", "apiVersion", "spec"},
+		Type:                   "object",
+		XPreserveUnknownFields: util.True(),
+		Required:               []string{"kind", "apiVersion", "spec"},
 		Properties: map[string]apiextv1.JSONSchemaProps{
 			"kind": {
 				Type: "string",
@@ -412,6 +414,9 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 									{
 										Raw: []byte(`"12"`),
 									},
+									{
+										Raw: []byte(`"13"`),
+									},
 								},
 							},
 							"parameters": {
@@ -779,8 +784,9 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
 // OperatorConfigCRDResourceValidation to check applied manifest parameters
 var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
 	OpenAPIV3Schema: &apiextv1.JSONSchemaProps{
-		Type:     "object",
-		Required: []string{"kind", "apiVersion", "configuration"},
+		Type:                   "object",
+		XPreserveUnknownFields: util.True(),
+		Required:               []string{"kind", "apiVersion", "configuration"},
 		Properties: map[string]apiextv1.JSONSchemaProps{
 			"kind": {
 				Type: "string",
@@ -1394,6 +1400,7 @@ func buildCRD(name, kind, plural, short string, columns []apiextv1.CustomResourc
 				Plural:     plural,
 				ShortNames: []string{short},
 				Kind:       kind,
+				Categories: []string{"all"},
 			},
 			Scope: apiextv1.NamespaceScoped,
 			Versions: []apiextv1.CustomResourceDefinitionVersion{