Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

K8SPXC-1195 add bucket and container options as required #1421

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
+69 −3
Draft

K8SPXC-1195 add bucket and container options as required #1421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3ee225
K8SPXC-1195 add bucket and container options as required
hors May 19, 2023
c9fb53b
Update pkg/apis/pxc/v1/pxc_types.go
hors May 19, 2023
f43bef6
Merge branch 'main' into K8SPXC-1195
hors May 19, 2023
25762c3
Merge branch 'main' into K8SPXC-1195
hors Jul 18, 2023
b7d4de6
Merge branch 'main' into K8SPXC-1195
hors Dec 7, 2023
8608969
Merge branch 'main' into K8SPXC-1195
egegunes Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions config/crd/bases/pxc.percona.com_perconaxtradbclusterbackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -132,6 +134,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/pxc.percona.com_perconaxtradbclusterrestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -117,6 +119,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -147,6 +151,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -204,6 +210,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
containerSecurityContext:
properties:
Expand Down Expand Up @@ -679,6 +681,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
schedulerName:
type: string
Expand Down
16 changes: 16 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -131,6 +133,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -220,6 +224,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -277,6 +283,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -307,6 +315,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -364,6 +374,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -1206,6 +1218,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
containerSecurityContext:
properties:
Expand Down Expand Up @@ -1385,6 +1399,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
schedulerName:
type: string
Expand Down
16 changes: 16 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -131,6 +133,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -220,6 +224,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -277,6 +283,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -307,6 +315,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -364,6 +374,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -1206,6 +1218,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
containerSecurityContext:
properties:
Expand Down Expand Up @@ -1385,6 +1399,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
schedulerName:
type: string
Expand Down
16 changes: 16 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -131,6 +133,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -220,6 +224,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -277,6 +283,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -307,6 +315,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
completed:
format: date-time
Expand Down Expand Up @@ -364,6 +374,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
sslInternalSecretName:
type: string
Expand Down Expand Up @@ -1206,6 +1218,8 @@ spec:
type: string
storageClass:
type: string
required:
- container
type: object
containerSecurityContext:
properties:
Expand Down Expand Up @@ -1385,6 +1399,8 @@ spec:
type: string
region:
type: string
required:
- bucket
type: object
schedulerName:
type: string
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/pxc/v1/pxc_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ const (
)

type BackupStorageS3Spec struct {
// +kubebuilder:validation:Required
Bucket string `json:"bucket"`
CredentialsSecret string `json:"credentialsSecret"`
Region string `json:"region,omitempty"`
Expand All @@ -530,6 +531,7 @@ type BackupStorageS3Spec struct {

type BackupStorageAzureSpec struct {
CredentialsSecret string `json:"credentialsSecret"`
// +kubebuilder:validation:Required
ContainerPath string `json:"container"`
Endpoint string `json:"endpointUrl"`
StorageClass string `json:"storageClass"`
hors marked this conversation as resolved.
Show resolved Hide resolved
Expand Down