Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c355873

Browse files
hold
1 parent 286ab77 commit c355873

File tree

3 files changed

+31
-8
lines changed

3 files changed

+31
-8
lines changed

‎config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11033,6 +11033,7 @@ spec:
1103311033
properties:
1103411034
claimName:
1103511035
description: A reference to a preexisting PVC.
11036+
maxLength: 10
1103611037
type: string
1103711038
claimTemplate:
1103811039
description: A PVC request.
@@ -11248,12 +11249,20 @@ spec:
1124811249
items:
1124911250
type: string
1125011251
type: array
11251-
x-kubernetes-list-type: set
11252+
x-kubernetes-list-type: atomic
1125211253
name:
11254+
allOf:
11255+
- maxLength: 253
11256+
- maxLength: 10
1125311257
description: |-
1125411258
The name of the volume used for mounting path.
1125511259
Must be unique.
11260+
minLength: 1
11261+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
1125611262
type: string
11263+
x-kubernetes-validations:
11264+
- message: immutable
11265+
rule: self == oldSelf
1125711266
readOnly:
1125811267
description: Sets the write/read mode of the volume
1125911268
type: boolean
@@ -29845,6 +29854,7 @@ spec:
2984529854
properties:
2984629855
claimName:
2984729856
description: A reference to a preexisting PVC.
29857+
maxLength: 10
2984829858
type: string
2984929859
claimTemplate:
2985029860
description: A PVC request.
@@ -30060,19 +30070,27 @@ spec:
3006030070
items:
3006130071
type: string
3006230072
type: array
30063-
x-kubernetes-list-type: set
30073+
x-kubernetes-list-type: atomic
3006430074
name:
30075+
allOf:
30076+
- maxLength: 253
30077+
- maxLength: 10
3006530078
description: |-
3006630079
The name of the volume used for mounting path.
3006730080
Must be unique.
30081+
minLength: 1
30082+
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?([.][a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
3006830083
type: string
30084+
x-kubernetes-validations:
30085+
- message: immutable
30086+
rule: self == oldSelf
3006930087
readOnly:
3007030088
description: Sets the write/read mode of the volume
3007130089
type: boolean
3007230090
required:
3007330091
- name
3007430092
type: object
30075-
maxItems: 10
30093+
maxItems: 1
3007630094
type: array
3007730095
x-kubernetes-list-map-keys:
3007830096
- name

‎pkg/apis/postgres-operator.crunchydata.com/v1/postgrescluster_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ type PostgresVolumesSpec struct {
542542
// +listType=map
543543
// +listMapKey=name
544544
// +kubebuilder:validation:MaxItems=10
545-
// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x == true).size() <= 1`,message=`can only have one of claimName, claimTemplate`
545+
// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x).size() <= 1`,message=`can only have one of claimName, claimTemplate`
546546
Additional []*v1beta1.AdditionalVolume `json:"additional,omitempty"`
547547
}
548548

‎pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,9 @@ type PostgresVolumesSpec struct {
539539
// +optional
540540
// +listType=map
541541
// +listMapKey=name
542-
// +kubebuilder:validation:MaxItems=10
543-
// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x == true).size() <= 1`,message=`can only have one of claimName, claimTemplate`
542+
// +kubebuilder:validation:MaxItems=1
543+
// // +kubebuilder:validation:items:XValidation:rule=`[has(self.claimName), has(self.claimTemplate)].filter(x, x).size() <= 1`,message=`can only have one of claimName, claimTemplate`
544+
// // +kubebuilder:validation:items:XValidation:rule=`has(oldSelf.claimTemplate) != has(self.claimTemplate)`,message=`testing`
544545
Additional []*AdditionalVolume `json:"additional,omitempty"`
545546
}
546547

@@ -549,12 +550,15 @@ type AdditionalVolume struct {
549550
// Must be unique.
550551
// ---
551552
// +kubebuilder:validation:Required
552-
// // +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
553-
Name string `json:"name,omitempty"`
553+
// TODO: CHANGE THE MAX LENGTH
554+
// +kubebuilder:validation:MaxLength=10
555+
Name DNS1123Subdomain `json:"name,omitempty"`
554556

555557
// A reference to a preexisting PVC.
556558
// ---
557559
// +optional
560+
// TODO: CHANGE THE MAX LENGTH
561+
// +kubebuilder:validation:MaxLength=10
558562
// // +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
559563
ClaimName string `json:"claimName,omitempty"`
560564

@@ -567,6 +571,7 @@ type AdditionalVolume struct {
567571
// ---
568572
// +optional
569573
// +listType=set
574+
// +listType=atomic
570575
Containers []string `json:"containers,omitempty"`
571576

572577
// Sets the write/read mode of the volume

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /