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

Feat: Attach multiple PVC to Instance. #360

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Feat: Attach multiple PVC to Instance. #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions common/api/v1alpha1/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ import (
// the model can be also adjusted to reflect that).
type DiskSpec struct {
// Name of a disk.
// Allowed values are: DataDisk,LogDisk,BackupDisk
// +required
// +kubebuilder:validation:Enum=DataDisk;LogDisk;BackupDisk
Name string `json:"name"`

// Disk size. If not specified, the defaults are: DataDisk:"100Gi", LogDisk:"150Gi",BackupDisk:"100Gi"
Expand Down
6 changes: 1 addition & 5 deletions oracle/config/crd/bases/oracle.db.anthosapis.com_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ spec:
external tools through Kubernetes.
type: object
name:
description: 'Name of a disk. Allowed values are: DataDisk,LogDisk,BackupDisk'
enum:
- DataDisk
- LogDisk
- BackupDisk
description: Name of a disk.
type: string
selector:
description: A label query over volumes to consider for binding.
Expand Down
6 changes: 1 addition & 5 deletions oracle/config/crd/bases/oracle.db.anthosapis.com_instances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,7 @@ spec:
external tools through Kubernetes.
type: object
name:
description: 'Name of a disk. Allowed values are: DataDisk,LogDisk,BackupDisk'
enum:
- DataDisk
- LogDisk
- BackupDisk
description: Name of a disk.
type: string
selector:
description: A label query over volumes to consider for binding.
Expand Down
4 changes: 2 additions & 2 deletions oracle/controllers/validationstest/crd_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ var _ = Describe("Instance CRD Validation rules", func() {
disks: []commonv1alpha1.DiskSpec{
{Name: "FrisbeeDisk"},
},
valid: false,
valid: true,
},
{
disks: []commonv1alpha1.DiskSpec{
{Name: "SystemDisk"},
{Name: "DataDisk"},
},
valid: false,
valid: true,
},
}

Expand Down
12 changes: 2 additions & 10 deletions oracle/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,11 +688,7 @@ spec:
external tools through Kubernetes.
type: object
name:
description: 'Name of a disk. Allowed values are: DataDisk,LogDisk,BackupDisk'
enum:
- DataDisk
- LogDisk
- BackupDisk
description: Name of a disk.
type: string
selector:
description: A label query over volumes to consider for binding.
Expand Down Expand Up @@ -1951,11 +1947,7 @@ spec:
external tools through Kubernetes.
type: object
name:
description: 'Name of a disk. Allowed values are: DataDisk,LogDisk,BackupDisk'
enum:
- DataDisk
- LogDisk
- BackupDisk
description: Name of a disk.
type: string
selector:
description: A label query over volumes to consider for binding.
Expand Down