move to apiextensions from v1beta1 to v1 (#746)

* move to apiextensions from v1beta1 to v1

* remove metadata from CRD validation

* some forgotten change

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

@@ -2,7 +2,7 @@ package v1
 
 import (
 	acidzalando "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do"
-	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -20,7 +20,7 @@ const (
 )
 
 // PostgresCRDResourceColumns definition of AdditionalPrinterColumns for postgresql CRD
-var PostgresCRDResourceColumns = []apiextv1beta1.CustomResourceColumnDefinition{
+var PostgresCRDResourceColumns = []apiextv1.CustomResourceColumnDefinition{
 	{
 		Name:        "Team",
 		Type:        "string",
@@ -71,7 +71,7 @@ var PostgresCRDResourceColumns = []apiextv1beta1.CustomResourceColumnDefinition{
 }
 
 // OperatorConfigCRDResourceColumns definition of AdditionalPrinterColumns for OperatorConfiguration CRD
-var OperatorConfigCRDResourceColumns = []apiextv1beta1.CustomResourceColumnDefinition{
+var OperatorConfigCRDResourceColumns = []apiextv1.CustomResourceColumnDefinition{
 	{
 		Name:        "Image",
 		Type:        "string",
@@ -107,17 +107,16 @@ var min0 = 0.0
 var min1 = 1.0
 var min2 = 2.0
 var minDisable = -1.0
-var maxLength = int64(53)
 
 // PostgresCRDResourceValidation to check applied manifest parameters
-var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
-	OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
+var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{
+	OpenAPIV3Schema: &apiextv1.JSONSchemaProps{
 		Type:     "object",
-		Required: []string{"kind", "apiVersion", "metadata", "spec"},
-		Properties: map[string]apiextv1beta1.JSONSchemaProps{
+		Required: []string{"kind", "apiVersion", "spec"},
+		Properties: map[string]apiextv1.JSONSchemaProps{
 			"kind": {
 				Type: "string",
-				Enum: []apiextv1beta1.JSON{
+				Enum: []apiextv1.JSON{
 					{
 						Raw: []byte(`"postgresql"`),
 					},
@@ -125,31 +124,21 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 			},
 			"apiVersion": {
 				Type: "string",
-				Enum: []apiextv1beta1.JSON{
+				Enum: []apiextv1.JSON{
 					{
 						Raw: []byte(`"acid.zalan.do/v1"`),
 					},
 				},
 			},
-			"metadata": {
-				Type:     "object",
-				Required: []string{"name"},
-				Properties: map[string]apiextv1beta1.JSONSchemaProps{
-					"name": {
-						Type:      "string",
-						MaxLength: &maxLength,
-					},
-				},
-			},
 			"spec": {
 				Type:     "object",
 				Required: []string{"numberOfInstances", "teamId", "postgresql", "volume"},
-				Properties: map[string]apiextv1beta1.JSONSchemaProps{
+				Properties: map[string]apiextv1.JSONSchemaProps{
 					"allowedSourceRanges": {
 						Type:     "array",
 						Nullable: true,
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:    "string",
 								Pattern: "^(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d|[1-9]\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\/(\\d|[1-2]\\d|3[0-2])$",
 							},
@@ -158,7 +147,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"clone": {
 						Type:     "object",
 						Required: []string{"cluster"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"cluster": {
 								Type: "string",
 							},
@@ -190,7 +179,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"connectionPooler": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"dockerImage": {
 								Type: "string",
 							},
@@ -199,7 +188,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 							},
 							"mode": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"session"`),
 									},
@@ -215,11 +204,11 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 							"resources": {
 								Type:     "object",
 								Required: []string{"requests", "limits"},
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"limits": {
 										Type:     "object",
 										Required: []string{"cpu", "memory"},
-										Properties: map[string]apiextv1beta1.JSONSchemaProps{
+										Properties: map[string]apiextv1.JSONSchemaProps{
 											"cpu": {
 												Type:        "string",
 												Description: "Decimal natural followed by m, or decimal natural followed by dot followed by up to three decimal digits (precision used by Kubernetes). Must be greater than 0",
@@ -235,7 +224,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 									"requests": {
 										Type:     "object",
 										Required: []string{"cpu", "memory"},
-										Properties: map[string]apiextv1beta1.JSONSchemaProps{
+										Properties: map[string]apiextv1.JSONSchemaProps{
 											"cpu": {
 												Type:        "string",
 												Description: "Decimal natural followed by m, or decimal natural followed by dot followed by up to three decimal digits (precision used by Kubernetes). Must be greater than 0",
@@ -260,8 +249,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"databases": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:        "string",
 								Description: "User names specified here as database owners must be declared in the users key of the spec key",
 							},
@@ -288,10 +277,10 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"init_containers": {
 						Type:        "array",
 						Description: "Deprecated",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
 									Allows: true,
 								},
 							},
@@ -299,10 +288,10 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"initContainers": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
 									Allows: true,
 								},
 							},
@@ -314,8 +303,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"maintenanceWindows": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:    "string",
 								Pattern: "^\\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\\d):([0-5]?\\d)|(2[0-3]|[01]?\\d):([0-5]?\\d))-((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\\d):([0-5]?\\d)|(2[0-3]|[01]?\\d):([0-5]?\\d))\\ *$",
 							},
@@ -327,30 +316,30 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"patroni": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"initdb": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
 							},
 							"pg_hba": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
 							},
 							"slots": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "object",
-										AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-											Schema: &apiextv1beta1.JSONSchemaProps{
+										AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+											Schema: &apiextv1.JSONSchemaProps{
 												Type: "string",
 											},
 										},
@@ -379,8 +368,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"podAnnotations": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "string",
 							},
 						},
@@ -395,10 +384,10 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"postgresql": {
 						Type:     "object",
 						Required: []string{"version"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"version": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"9.3"`),
 									},
@@ -424,8 +413,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 							},
 							"parameters": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -434,27 +423,27 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"preparedDatabases": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "object",
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"defaultUsers": {
 										Type: "boolean",
 									},
 									"extensions": {
 										Type: "object",
-										AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-											Schema: &apiextv1beta1.JSONSchemaProps{
+										AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+											Schema: &apiextv1.JSONSchemaProps{
 												Type: "string",
 											},
 										},
 									},
 									"schemas": {
 										Type: "object",
-										AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-											Schema: &apiextv1beta1.JSONSchemaProps{
+										AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+											Schema: &apiextv1.JSONSchemaProps{
 												Type: "object",
-												Properties: map[string]apiextv1beta1.JSONSchemaProps{
+												Properties: map[string]apiextv1.JSONSchemaProps{
 													"defaultUsers": {
 														Type: "boolean",
 													},
@@ -476,11 +465,11 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"resources": {
 						Type:     "object",
 						Required: []string{"requests", "limits"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"limits": {
 								Type:     "object",
 								Required: []string{"cpu", "memory"},
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"cpu": {
 										Type:        "string",
 										Description: "Decimal natural followed by m, or decimal natural followed by dot followed by up to three decimal digits (precision used by Kubernetes). Must be greater than 0",
@@ -496,7 +485,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 							"requests": {
 								Type:     "object",
 								Required: []string{"cpu", "memory"},
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"cpu": {
 										Type:        "string",
 										Description: "Decimal natural followed by m, or decimal natural followed by dot followed by up to three decimal digits (precision used by Kubernetes). Must be greater than 0",
@@ -513,18 +502,18 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"serviceAnnotations": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "string",
 							},
 						},
 					},
 					"sidecars": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
 									Allows: true,
 								},
 							},
@@ -542,7 +531,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"standby": {
 						Type:     "object",
 						Required: []string{"s3_wal_path"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"s3_wal_path": {
 								Type: "string",
 							},
@@ -554,7 +543,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"tls": {
 						Type:     "object",
 						Required: []string{"secretName"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"secretName": {
 								Type: "string",
 							},
@@ -574,17 +563,17 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"tolerations": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:     "object",
 								Required: []string{"key", "operator", "effect"},
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"key": {
 										Type: "string",
 									},
 									"operator": {
 										Type: "string",
-										Enum: []apiextv1beta1.JSON{
+										Enum: []apiextv1.JSON{
 											{
 												Raw: []byte(`"Equal"`),
 											},
@@ -598,7 +587,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 									},
 									"effect": {
 										Type: "string",
-										Enum: []apiextv1beta1.JSON{
+										Enum: []apiextv1.JSON{
 											{
 												Raw: []byte(`"NoExecute"`),
 											},
@@ -623,15 +612,15 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"users": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:        "array",
 								Description: "Role flags specified here must not contradict each other",
 								Nullable:    true,
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
-										Enum: []apiextv1beta1.JSON{
+										Enum: []apiextv1.JSON{
 											{
 												Raw: []byte(`"bypassrls"`),
 											},
@@ -725,7 +714,7 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					"volume": {
 						Type:     "object",
 						Required: []string{"size"},
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"size": {
 								Type:        "string",
 								Description: "Value must not be zero",
@@ -741,11 +730,11 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 					},
 					"additionalVolumes": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type:     "object",
 								Required: []string{"name", "mountPath", "volumeSource"},
-								Properties: map[string]apiextv1beta1.JSONSchemaProps{
+								Properties: map[string]apiextv1.JSONSchemaProps{
 									"name": {
 										Type: "string",
 									},
@@ -754,8 +743,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 									},
 									"targetContainers": {
 										Type: "array",
-										Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-											Schema: &apiextv1beta1.JSONSchemaProps{
+										Items: &apiextv1.JSONSchemaPropsOrArray{
+											Schema: &apiextv1.JSONSchemaProps{
 												Type: "string",
 											},
 										},
@@ -774,8 +763,8 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 			},
 			"status": {
 				Type: "object",
-				AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-					Schema: &apiextv1beta1.JSONSchemaProps{
+				AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+					Schema: &apiextv1.JSONSchemaProps{
 						Type: "string",
 					},
 				},
@@ -785,14 +774,14 @@ var PostgresCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
 }
 
 // OperatorConfigCRDResourceValidation to check applied manifest parameters
-var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation{
-	OpenAPIV3Schema: &apiextv1beta1.JSONSchemaProps{
+var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
+	OpenAPIV3Schema: &apiextv1.JSONSchemaProps{
 		Type:     "object",
 		Required: []string{"kind", "apiVersion", "configuration"},
-		Properties: map[string]apiextv1beta1.JSONSchemaProps{
+		Properties: map[string]apiextv1.JSONSchemaProps{
 			"kind": {
 				Type: "string",
-				Enum: []apiextv1beta1.JSON{
+				Enum: []apiextv1.JSON{
 					{
 						Raw: []byte(`"OperatorConfiguration"`),
 					},
@@ -800,7 +789,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 			},
 			"apiVersion": {
 				Type: "string",
-				Enum: []apiextv1beta1.JSON{
+				Enum: []apiextv1.JSON{
 					{
 						Raw: []byte(`"acid.zalan.do/v1"`),
 					},
@@ -808,7 +797,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 			},
 			"configuration": {
 				Type: "object",
-				Properties: map[string]apiextv1beta1.JSONSchemaProps{
+				Properties: map[string]apiextv1.JSONSchemaProps{
 					"docker_image": {
 						Type: "string",
 					},
@@ -848,18 +837,18 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"sidecar_docker_images": {
 						Type: "object",
-						AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "string",
 							},
 						},
 					},
 					"sidecars": {
 						Type: "array",
-						Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-							Schema: &apiextv1beta1.JSONSchemaProps{
+						Items: &apiextv1.JSONSchemaPropsOrArray{
+							Schema: &apiextv1.JSONSchemaProps{
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
 									Allows: true,
 								},
 							},
@@ -871,7 +860,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"users": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"replication_username": {
 								Type: "string",
 							},
@@ -882,14 +871,14 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"kubernetes": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"cluster_domain": {
 								Type: "string",
 							},
 							"cluster_labels": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -899,8 +888,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"custom_pod_annotations": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -913,8 +902,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"downscaler_annotations": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -936,11 +925,11 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"infrastructure_roles_secrets": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type:     "object",
 										Required: []string{"secretname", "userkey", "passwordkey"},
-										Properties: map[string]apiextv1beta1.JSONSchemaProps{
+										Properties: map[string]apiextv1.JSONSchemaProps{
 											"secretname": {
 												Type: "string",
 											},
@@ -971,8 +960,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"inherited_labels": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -982,8 +971,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"node_readiness_label": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -1005,7 +994,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"pod_management_policy": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"ordered_ready"`),
 									},
@@ -1049,7 +1038,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"storage_resize_mode": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"ebs"`),
 									},
@@ -1063,8 +1052,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"toleration": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -1076,7 +1065,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"postgres_pod_resources": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"default_cpu_limit": {
 								Type:    "string",
 								Pattern: "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
@@ -1105,7 +1094,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"timeouts": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"pod_label_wait_timeout": {
 								Type: "string",
 							},
@@ -1128,11 +1117,11 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"load_balancer": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"custom_service_annotations": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -1148,7 +1137,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"external_traffic_policy": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"Cluster"`),
 									},
@@ -1167,7 +1156,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"aws_or_gcp": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"additional_secret_mount": {
 								Type: "string",
 							},
@@ -1190,7 +1179,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"logical_backup": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"logical_backup_docker_image": {
 								Type: "string",
 							},
@@ -1220,7 +1209,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"debug": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"debug_logging": {
 								Type: "boolean",
 							},
@@ -1231,7 +1220,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"teams_api": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"enable_admin_role_for_users": {
 								Type: "boolean",
 							},
@@ -1255,16 +1244,16 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"postgres_superuser_teams": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
 							},
 							"protected_role_names": {
 								Type: "array",
-								Items: &apiextv1beta1.JSONSchemaPropsOrArray{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								Items: &apiextv1.JSONSchemaPropsOrArray{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -1274,8 +1263,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"team_api_role_configuration": {
 								Type: "object",
-								AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-									Schema: &apiextv1beta1.JSONSchemaProps{
+								AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+									Schema: &apiextv1.JSONSchemaProps{
 										Type: "string",
 									},
 								},
@@ -1287,7 +1276,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"logging_rest_api": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"api_port": {
 								Type: "integer",
 							},
@@ -1301,7 +1290,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"scalyr": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"scalyr_api_key": {
 								Type: "string",
 							},
@@ -1331,7 +1320,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 					},
 					"connection_pooler": {
 						Type: "object",
-						Properties: map[string]apiextv1beta1.JSONSchemaProps{
+						Properties: map[string]apiextv1.JSONSchemaProps{
 							"connection_pooler_default_cpu_limit": {
 								Type:    "string",
 								Pattern: "^(\\d+m|\\d+(\\.\\d{1,3})?)$",
@@ -1356,7 +1345,7 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 							},
 							"connection_pooler_mode": {
 								Type: "string",
-								Enum: []apiextv1beta1.JSON{
+								Enum: []apiextv1.JSON{
 									{
 										Raw: []byte(`"session"`),
 									},
@@ -1381,8 +1370,8 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 			},
 			"status": {
 				Type: "object",
-				AdditionalProperties: &apiextv1beta1.JSONSchemaPropsOrBool{
-					Schema: &apiextv1beta1.JSONSchemaProps{
+				AdditionalProperties: &apiextv1.JSONSchemaPropsOrBool{
+					Schema: &apiextv1.JSONSchemaProps{
 						Type: "string",
 					},
 				},
@@ -1391,32 +1380,38 @@ var OperatorConfigCRDResourceValidation = apiextv1beta1.CustomResourceValidation
 	},
 }
 
-func buildCRD(name, kind, plural, short string, columns []apiextv1beta1.CustomResourceColumnDefinition, validation apiextv1beta1.CustomResourceValidation) *apiextv1beta1.CustomResourceDefinition {
-	return &apiextv1beta1.CustomResourceDefinition{
+func buildCRD(name, kind, plural, short string, columns []apiextv1.CustomResourceColumnDefinition, validation apiextv1.CustomResourceValidation) *apiextv1.CustomResourceDefinition {
+	return &apiextv1.CustomResourceDefinition{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: apiextv1beta1.CustomResourceDefinitionSpec{
-			Group:   SchemeGroupVersion.Group,
-			Version: SchemeGroupVersion.Version,
-			Names: apiextv1beta1.CustomResourceDefinitionNames{
+		Spec: apiextv1.CustomResourceDefinitionSpec{
+			Group: SchemeGroupVersion.Group,
+			Names: apiextv1.CustomResourceDefinitionNames{
 				Plural:     plural,
 				ShortNames: []string{short},
 				Kind:       kind,
 			},
-			Scope: apiextv1beta1.NamespaceScoped,
-			Subresources: &apiextv1beta1.CustomResourceSubresources{
-				Status: &apiextv1beta1.CustomResourceSubresourceStatus{},
+			Scope: apiextv1.NamespaceScoped,
+			Versions: []apiextv1.CustomResourceDefinitionVersion{
+				apiextv1.CustomResourceDefinitionVersion{
+					Name:    SchemeGroupVersion.Version,
+					Served:  true,
+					Storage: true,
+					Subresources: &apiextv1.CustomResourceSubresources{
+						Status: &apiextv1.CustomResourceSubresourceStatus{},
+					},
+					AdditionalPrinterColumns: columns,
+					Schema:                   &validation,
+				},
 			},
-			AdditionalPrinterColumns: columns,
-			Validation:               &validation,
 		},
 	}
 }
 
 // PostgresCRD returns CustomResourceDefinition built from PostgresCRDResource
-func PostgresCRD(enableValidation *bool) *apiextv1beta1.CustomResourceDefinition {
-	postgresCRDvalidation := apiextv1beta1.CustomResourceValidation{}
+func PostgresCRD(enableValidation *bool) *apiextv1.CustomResourceDefinition {
+	postgresCRDvalidation := apiextv1.CustomResourceValidation{}
 
 	if enableValidation != nil && *enableValidation {
 		postgresCRDvalidation = PostgresCRDResourceValidation
@@ -1431,8 +1426,8 @@ func PostgresCRD(enableValidation *bool) *apiextv1beta1.CustomResourceDefinition
 }
 
 // ConfigurationCRD returns CustomResourceDefinition built from OperatorConfigCRDResource
-func ConfigurationCRD(enableValidation *bool) *apiextv1beta1.CustomResourceDefinition {
-	opconfigCRDvalidation := apiextv1beta1.CustomResourceValidation{}
+func ConfigurationCRD(enableValidation *bool) *apiextv1.CustomResourceDefinition {
+	opconfigCRDvalidation := apiextv1.CustomResourceValidation{}
 
 	if enableValidation != nil && *enableValidation {
 		opconfigCRDvalidation = OperatorConfigCRDResourceValidation

pkg/controller/util.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	v1 "k8s.io/api/core/v1"
-	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -54,7 +54,7 @@ func (c *Controller) clusterWorkerID(clusterName spec.NamespacedName) uint32 {
 	return c.clusterWorkers[clusterName]
 }
 
-func (c *Controller) createOperatorCRD(crd *apiextv1beta1.CustomResourceDefinition) error {
+func (c *Controller) createOperatorCRD(crd *apiextv1.CustomResourceDefinition) error {
 	if _, err := c.KubeClient.CustomResourceDefinitions().Create(context.TODO(), crd, metav1.CreateOptions{}); err != nil {
 		if k8sutil.ResourceAlreadyExists(err) {
 			c.logger.Infof("customResourceDefinition %q is already registered and will only be updated", crd.Name)
@@ -82,12 +82,12 @@ func (c *Controller) createOperatorCRD(crd *apiextv1beta1.CustomResourceDefiniti
 
 		for _, cond := range c.Status.Conditions {
 			switch cond.Type {
-			case apiextv1beta1.Established:
-				if cond.Status == apiextv1beta1.ConditionTrue {
+			case apiextv1.Established:
+				if cond.Status == apiextv1.ConditionTrue {
 					return true, err
 				}
-			case apiextv1beta1.NamesAccepted:
-				if cond.Status == apiextv1beta1.ConditionFalse {
+			case apiextv1.NamesAccepted:
+				if cond.Status == apiextv1.ConditionFalse {
 					return false, fmt.Errorf("name conflict: %v", cond.Reason)
 				}
 			}

pkg/util/k8sutil/k8sutil.go

@@ -17,7 +17,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	policybeta1 "k8s.io/api/policy/v1beta1"
 	apiextclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
-	apiextbeta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
@@ -53,7 +53,7 @@ type KubernetesClient struct {
 	appsv1.DeploymentsGetter
 	rbacv1.RoleBindingsGetter
 	policyv1beta1.PodDisruptionBudgetsGetter
-	apiextbeta1.CustomResourceDefinitionsGetter
+	apiextv1.CustomResourceDefinitionsGetter
 	clientbatchv1beta1.CronJobsGetter
 
 	RESTClient      rest.Interface
@@ -153,7 +153,7 @@ func NewFromConfig(cfg *rest.Config) (KubernetesClient, error) {
 		return kubeClient, fmt.Errorf("could not create api client:%v", err)
 	}
 
-	kubeClient.CustomResourceDefinitionsGetter = apiextClient.ApiextensionsV1beta1()
+	kubeClient.CustomResourceDefinitionsGetter = apiextClient.ApiextensionsV1()
 	kubeClient.AcidV1ClientSet = acidv1client.NewForConfigOrDie(cfg)
 
 	return kubeClient, nil