public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-09-30 10:11:49 +02:00
Code Issues Projects Releases Wiki Activity

CRD: preserve unknown fields and add to all category (#1212)

Browse Source 
* CRD: preserve unknown fields and add to all category

* allow Pg13

* left over
This commit is contained in:
Felix Kunde
2020-11-16 10:29:01 +01:00
committed by GitHub
parent a7f453352a
commit 3e42e8a896
7 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/postgres-operator/crds/operatorconfigurations.yaml
+3
View File
@@ -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
+4
View File
@@ -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
+3
View File
@@ -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
manifests/operatorconfiguration.crd.yaml
+3
View File
@@ -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
+4
View File
@@ -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
+3
View File
@@ -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
+11 -4
View File
@@ -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{