diff --git a/config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml b/config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml index 3f94493da0..5ed3a7e33e 100644 --- a/config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml +++ b/config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml @@ -153,6 +153,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -210,6 +212,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string diff --git a/config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml b/config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml index b22210e5a8..5fcfe05db1 100644 --- a/config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml +++ b/config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml @@ -60,6 +60,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -117,6 +119,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -225,6 +229,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -282,6 +288,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string diff --git a/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml b/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml index 2ba75a45bc..bc630c1e98 100644 --- a/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml +++ b/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml @@ -508,6 +508,8 @@ spec: type: string storageClass: type: string + required: + - container type: object containerOptions: properties: @@ -765,6 +767,8 @@ spec: type: string region: type: string + required: + - bucket type: object schedulerName: type: string diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 761630acbe..bbbc61bca4 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -152,6 +152,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -209,6 +211,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -298,6 +302,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -355,6 +361,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -463,6 +471,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -520,6 +530,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -1401,6 +1413,8 @@ spec: type: string storageClass: type: string + required: + - container type: object containerOptions: properties: @@ -1658,6 +1672,8 @@ spec: type: string region: type: string + required: + - bucket type: object schedulerName: type: string diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 0915addaf2..4b80099da0 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -152,6 +152,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -209,6 +211,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -298,6 +302,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -355,6 +361,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -463,6 +471,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -520,6 +530,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -1401,6 +1413,8 @@ spec: type: string storageClass: type: string + required: + - container type: object containerOptions: properties: @@ -1658,6 +1672,8 @@ spec: type: string region: type: string + required: + - bucket type: object schedulerName: type: string diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 341c16ac6c..c18515dee4 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -152,6 +152,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -209,6 +211,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -298,6 +302,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -355,6 +361,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -463,6 +471,8 @@ spec: type: string storageClass: type: string + required: + - container type: object completed: format: date-time @@ -520,6 +530,8 @@ spec: type: string region: type: string + required: + - bucket type: object sslInternalSecretName: type: string @@ -1401,6 +1413,8 @@ spec: type: string storageClass: type: string + required: + - container type: object containerOptions: properties: @@ -1658,6 +1672,8 @@ spec: type: string region: type: string + required: + - bucket type: object schedulerName: type: string diff --git a/pkg/apis/pxc/v1/pxc_types.go b/pkg/apis/pxc/v1/pxc_types.go index 087e5949d7..bf4c3d14bd 100644 --- a/pkg/apis/pxc/v1/pxc_types.go +++ b/pkg/apis/pxc/v1/pxc_types.go @@ -601,6 +601,7 @@ const ( ) type BackupStorageS3Spec struct { + // +kubebuilder:validation:Required Bucket string `json:"bucket"` CredentialsSecret string `json:"credentialsSecret"` Region string `json:"region,omitempty"` @@ -609,9 +610,10 @@ type BackupStorageS3Spec struct { type BackupStorageAzureSpec struct { CredentialsSecret string `json:"credentialsSecret"` - ContainerPath string `json:"container"` - Endpoint string `json:"endpointUrl"` - StorageClass string `json:"storageClass"` + // +kubebuilder:validation:Required + ContainerPath string `json:"container"` + Endpoint string `json:"endpointUrl"` + StorageClass string `json:"storageClass"` } const (