public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove validation for kind, apiVersion and metadata

This commit is contained in:
Felix Kunde 2019-10-29 16:21:45 +01:00
parent ba528cba4b
commit 4d3dce2968
4 changed files with 2 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
charts/postgres-operator/templates/customrresourcedefinition.yaml
View File

@ -57,37 +57,8 @@ spec:
validation:
openAPIV3Schema:
required:
- kind
- apiVersion
- metadata
- spec
properties:
kind:
type: string
enum:
- postgresql
apiVersion:
type: string
enum:
- acid.zalan.do/v1
metadata:
type: object
required:
- name
properties:
annotations:
type: object
additionalProperties:
type: string
labels:
type: object
additionalProperties:
type: string
name:
type: string
# Note: the cluster name specified here must begin with the team name.
namespace:
type: string
spec:
type: object
required:
@ -405,36 +376,8 @@ spec:
validation:
openAPIV3Schema:
required:
- kind
- apiVersion
- metadata
- configuration
properties:
kind:
type: string
enum:
- OperatorConfiguration
apiVersion:
type: string
enum:
- acid.zalan.do/v1
metadata:
type: object
required:
- name
properties:
annotations:
type: object
additionalProperties:
type: string
labels:
type: object
additionalProperties:
type: string
name:
type: string
namespace:
type: string
configuration:
type: object
properties:

28
manifests/operatorconfiguration.crd.yaml
View File

@ -17,36 +17,8 @@ spec:
validation:
openAPIV3Schema:
required:
- kind
- apiVersion
- metadata
- configuration
properties:
kind:
type: string
enum:
- OperatorConfiguration
apiVersion:
type: string
enum:
- acid.zalan.do/v1
metadata:
type: object
required:
- name
properties:
annotations:
type: object
additionalProperties:
type: string
labels:
type: object
additionalProperties:
type: string
name:
type: string
namespace:
type: string
configuration:
type: object
properties:

29
manifests/postgresql.crd.yaml
View File

@ -17,37 +17,8 @@ spec:
validation:
openAPIV3Schema:
required:
- kind
- apiVersion
- metadata
- spec
properties:
kind:
type: string
enum:
- postgresql
apiVersion:
type: string
enum:
- acid.zalan.do/v1
metadata:
type: object
required:
- name
properties:
annotations:
type: object
additionalProperties:
type: string
labels:
type: object
additionalProperties:
type: string
name:
type: string
# Note: the cluster name specified here must begin with the team name.
namespace:
type: string
spec:
type: object
required:

93
pkg/apis/acid.zalan.do/v1/crds.go
View File

@ -109,53 +109,8 @@ var minDisable = -1.0
var postgresCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
Type: "object",
Required: []string{"kind", "apiVersion", "metadata", "spec"},
Required: []string{"spec"},
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"kind": {
Type: "string",
Enum: []apiextv1beta1.JSON{
{
Raw: []byte(`"postgresql"`),
},
},
},
"apiVersion": {
Type: "string",
Enum: []apiextv1beta1.JSON{
{
Raw: []byte(`"acid.zalan.do/v1"`),
},
},
},
"metadata": {
Type: "object",
Required: []string{"name"},
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"annotations": {
Type: "object",
AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
Schema: &apiextv1beta1.JSONSchemaProps{
Type: "string",
},
},
},
"labels": {
Type: "object",
AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
Schema: &apiextv1beta1.JSONSchemaProps{
Type: "string",
},
},
},
"name": {
Type: "string",
Description: "The cluster name specified here must begin with the team name",
},
"namespace": {
Type: "string",
},
},
},
"spec": {
Type: "object",
Required: []string{"numberOfInstances", "teamId", "postgresql"},
@ -567,52 +522,8 @@ var postgresCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
var operatorConfigCRDResourceValidation = apiextv1beta1.JSONSchemaProps{
Type: "object",
Required: []string{"kind", "apiVersion", "metadata", "configuration"},
Required: []string{"configuration"},
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"kind": {
Type: "string",
Enum: []apiextv1beta1.JSON{
{
Raw: []byte(`"OperatorConfiguration"`),
},
},
},
"apiVersion": {
Type: "string",
Enum: []apiextv1beta1.JSON{
{
Raw: []byte(`"acid.zalan.do/v1"`),
},
},
},
"metadata": {
Type: "object",
Required: []string{"name"},
Properties: map[string]apiextv1beta1.JSONSchemaProps{
"annotations": {
Type: "object",
AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
Schema: &apiextv1beta1.JSONSchemaProps{
Type: "string",
},
},
},
"labels": {
Type: "object",
AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
Schema: &apiextv1beta1.JSONSchemaProps{
Type: "string",
},
},
},
"name": {
Type: "string",
},
"namespace": {
Type: "string",
},
},
},
"configuration": {
Type: "object",
Properties: map[string]apiextv1beta1.JSONSchemaProps{