From a84c702256d20058d2133546cde1871dbbbcb25e Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Tue, 14 Jan 2025 17:22:01 +0800 Subject: [PATCH 1/6] fix: cluster supports specifing PVC annotations and labels --- apis/apps/v1/deprecated.go | 4 +- apis/apps/v1/types.go | 10 ++ apis/apps/v1/zz_generated.deepcopy.go | 14 +++ apis/apps/v1alpha1/cluster_types.go | 13 ++- apis/apps/v1alpha1/zz_generated.deepcopy.go | 14 +++ .../bases/apps.kubeblocks.io_clusters.yaml | 96 +++++++++++++++++++ .../bases/apps.kubeblocks.io_components.yaml | 46 +++++++++ .../operations.kubeblocks.io_opsrequests.yaml | 24 +++++ .../workloads.kubeblocks.io_instancesets.yaml | 12 +++ .../crds/apps.kubeblocks.io_clusters.yaml | 96 +++++++++++++++++++ .../crds/apps.kubeblocks.io_components.yaml | 46 +++++++++ .../operations.kubeblocks.io_opsrequests.yaml | 24 +++++ .../workloads.kubeblocks.io_instancesets.yaml | 12 +++ docs/developer_docs/api-reference/cluster.md | 48 ++++++++++ pkg/controllerutil/volume_util.go | 4 +- 15 files changed, 460 insertions(+), 3 deletions(-) diff --git a/apis/apps/v1/deprecated.go b/apis/apps/v1/deprecated.go index 71e5cd4de35..3d95c31d439 100644 --- a/apis/apps/v1/deprecated.go +++ b/apis/apps/v1/deprecated.go @@ -152,7 +152,9 @@ func (r *ClusterComponentStatus) GetObjectMessage(objectKind, objectName string) func (r *ClusterComponentVolumeClaimTemplate) toVolumeClaimTemplate() corev1.PersistentVolumeClaimTemplate { return corev1.PersistentVolumeClaimTemplate{ ObjectMeta: metav1.ObjectMeta{ - Name: r.Name, + Labels: r.Labels, + Annotations: r.Annotations, + Name: r.Name, }, Spec: r.Spec.ToV1PersistentVolumeClaimSpec(), } diff --git a/apis/apps/v1/types.go b/apis/apps/v1/types.go index 0a51b10e4a9..3228313f1b1 100644 --- a/apis/apps/v1/types.go +++ b/apis/apps/v1/types.go @@ -182,6 +182,16 @@ type ServiceRefCredentialSelector struct { } type ClusterComponentVolumeClaimTemplate struct { + // Specifies Labels to override or add for the PVC. + // + // +optional + Labels map[string]string `json:"labels,omitempty"` + + // Specifies Annotations to override or add for the PVC. + // + // +optional + Annotations map[string]string `json:"annotations,omitempty"` + // Refers to the name of a volumeMount defined in either: // // - `componentDefinition.spec.runtime.containers[*].volumeMounts` diff --git a/apis/apps/v1/zz_generated.deepcopy.go b/apis/apps/v1/zz_generated.deepcopy.go index 300a52d5052..05e9b44814c 100644 --- a/apis/apps/v1/zz_generated.deepcopy.go +++ b/apis/apps/v1/zz_generated.deepcopy.go @@ -393,6 +393,20 @@ func (in *ClusterComponentStatus) DeepCopy() *ClusterComponentStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterComponentVolumeClaimTemplate) DeepCopyInto(out *ClusterComponentVolumeClaimTemplate) { *out = *in + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } in.Spec.DeepCopyInto(&out.Spec) } diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index 67d538722c0..99fa82ed3af 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -980,6 +980,15 @@ type ClusterSwitchPolicy struct { } type ClusterComponentVolumeClaimTemplate struct { + // Specifies Labels to override or add for the PVC. + // + // +optional + Labels map[string]string `json:"labels,omitempty"` + + // Specifies Annotations to override or add for the PVC. + // + // +optional + Annotations map[string]string `json:"annotations,omitempty"` // Refers to the name of a volumeMount defined in either: // // - `componentDefinition.spec.runtime.containers[*].volumeMounts` @@ -1003,7 +1012,9 @@ type ClusterComponentVolumeClaimTemplate struct { func (r *ClusterComponentVolumeClaimTemplate) toVolumeClaimTemplate() corev1.PersistentVolumeClaimTemplate { return corev1.PersistentVolumeClaimTemplate{ ObjectMeta: metav1.ObjectMeta{ - Name: r.Name, + Labels: r.Labels, + Annotations: r.Annotations, + Name: r.Name, }, Spec: r.Spec.ToV1PersistentVolumeClaimSpec(), } diff --git a/apis/apps/v1alpha1/zz_generated.deepcopy.go b/apis/apps/v1alpha1/zz_generated.deepcopy.go index 0b8733683df..72487a3d7e3 100644 --- a/apis/apps/v1alpha1/zz_generated.deepcopy.go +++ b/apis/apps/v1alpha1/zz_generated.deepcopy.go @@ -592,6 +592,20 @@ func (in *ClusterComponentStatus) DeepCopy() *ClusterComponentStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterComponentVolumeClaimTemplate) DeepCopyInto(out *ClusterComponentVolumeClaimTemplate) { *out = *in + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } in.Spec.DeepCopyInto(&out.Spec) } diff --git a/config/crd/bases/apps.kubeblocks.io_clusters.yaml b/config/crd/bases/apps.kubeblocks.io_clusters.yaml index 7ac44eebc41..f410a378247 100644 --- a/config/crd/bases/apps.kubeblocks.io_clusters.yaml +++ b/config/crd/bases/apps.kubeblocks.io_clusters.yaml @@ -1861,6 +1861,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add + for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -5410,6 +5422,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -10571,6 +10595,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -14161,6 +14197,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for + the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -18303,6 +18351,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add + for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -22149,6 +22209,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -27496,6 +27568,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -31387,6 +31471,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for + the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/config/crd/bases/apps.kubeblocks.io_components.yaml b/config/crd/bases/apps.kubeblocks.io_components.yaml index b2a53efd985..e129d5f7983 100644 --- a/config/crd/bases/apps.kubeblocks.io_components.yaml +++ b/config/crd/bases/apps.kubeblocks.io_components.yaml @@ -1720,6 +1720,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -5661,6 +5673,17 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add for the + PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -9383,6 +9406,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -13331,6 +13366,17 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add for the + PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml index acd94aa00c3..20ec7b514a7 100644 --- a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml +++ b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml @@ -2093,6 +2093,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -6674,6 +6686,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml index d20170e3eca..ff718a93ee8 100644 --- a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml +++ b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml @@ -1742,6 +1742,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml index 7ac44eebc41..f410a378247 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml @@ -1861,6 +1861,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add + for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -5410,6 +5422,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -10571,6 +10595,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -14161,6 +14197,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for + the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -18303,6 +18351,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add + for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -22149,6 +22209,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -27496,6 +27568,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -31387,6 +31471,18 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or + add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for + the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/deploy/helm/crds/apps.kubeblocks.io_components.yaml b/deploy/helm/crds/apps.kubeblocks.io_components.yaml index b2a53efd985..e129d5f7983 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_components.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_components.yaml @@ -1720,6 +1720,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -5661,6 +5673,17 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add for the + PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -9383,6 +9406,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -13331,6 +13366,17 @@ spec: These templates are used to dynamically provision persistent volumes for the Component. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add for the + PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml index acd94aa00c3..20ec7b514a7 100755 --- a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml +++ b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml @@ -2093,6 +2093,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: @@ -6674,6 +6686,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override + or add for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or + add for the PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml index d20170e3eca..ff718a93ee8 100644 --- a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml +++ b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml @@ -1742,6 +1742,18 @@ spec: Add new or override existing volume claim templates. items: properties: + annotations: + additionalProperties: + type: string + description: Specifies Annotations to override or add + for the PVC. + type: object + labels: + additionalProperties: + type: string + description: Specifies Labels to override or add for the + PVC. + type: object name: description: |- Refers to the name of a volumeMount defined in either: diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md index 1fb5b6f1892..c2710b2d3f0 100644 --- a/docs/developer_docs/api-reference/cluster.md +++ b/docs/developer_docs/api-reference/cluster.md @@ -3207,6 +3207,30 @@ The keys are either podName, deployName, or statefulSetName, formatted as &lsquo +labels
+ +map[string]string + + + +(Optional) +

Specifies Labels to override or add for the PVC.

+ + + + +annotations
+ +map[string]string + + + +(Optional) +

Specifies Annotations to override or add for the PVC.

+ + + + name
string @@ -16321,6 +16345,30 @@ This is the readiness time of the last Component Pod.

+labels
+ +map[string]string + + + +(Optional) +

Specifies Labels to override or add for the PVC.

+ + + + +annotations
+ +map[string]string + + + +(Optional) +

Specifies Annotations to override or add for the PVC.

+ + + + name
string diff --git a/pkg/controllerutil/volume_util.go b/pkg/controllerutil/volume_util.go index d6da6a5fc8c..ca984b86a34 100644 --- a/pkg/controllerutil/volume_util.go +++ b/pkg/controllerutil/volume_util.go @@ -132,7 +132,9 @@ func ToCoreV1PVCs(vcts []appsv1.ClusterComponentVolumeClaimTemplate) []corev1.Pe for _, v := range vcts { pvcs = append(pvcs, corev1.PersistentVolumeClaim{ ObjectMeta: metav1.ObjectMeta{ - Name: v.Name, + Labels: v.Labels, + Annotations: v.Annotations, + Name: v.Name, }, Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: v.Spec.AccessModes, From 3005d59d90133c0eca400c87a76a919e0d12f496 Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Tue, 14 Jan 2025 17:28:13 +0800 Subject: [PATCH 2/6] fix --- apis/apps/v1alpha1/cluster_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index 99fa82ed3af..5cbcf47dc8b 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -989,6 +989,7 @@ type ClusterComponentVolumeClaimTemplate struct { // // +optional Annotations map[string]string `json:"annotations,omitempty"` + // Refers to the name of a volumeMount defined in either: // // - `componentDefinition.spec.runtime.containers[*].volumeMounts` From c1f9fc3be1430fbe2d13f5589a5b55c32fe6acbb Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Tue, 14 Jan 2025 17:51:13 +0800 Subject: [PATCH 3/6] fix lint --- apis/apps/v1alpha1/cluster_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index 5cbcf47dc8b..5317aed20ed 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -989,7 +989,7 @@ type ClusterComponentVolumeClaimTemplate struct { // // +optional Annotations map[string]string `json:"annotations,omitempty"` - + // Refers to the name of a volumeMount defined in either: // // - `componentDefinition.spec.runtime.containers[*].volumeMounts` From 01e5d4f1286b82cadbd3b681549aa37e1dd0bc5d Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Wed, 15 Jan 2025 15:56:37 +0800 Subject: [PATCH 4/6] fix doc --- apis/apps/v1/types.go | 6 +- apis/apps/v1alpha1/cluster_types.go | 6 +- .../bases/apps.kubeblocks.io_clusters.yaml | 80 +++++++++++-------- .../bases/apps.kubeblocks.io_components.yaml | 38 +++++---- .../operations.kubeblocks.io_opsrequests.yaml | 20 +++-- .../workloads.kubeblocks.io_instancesets.yaml | 10 ++- .../samples/apps_v1alpha1_opsdefinition.yaml | 6 ++ .../crds/apps.kubeblocks.io_clusters.yaml | 80 +++++++++++-------- .../crds/apps.kubeblocks.io_components.yaml | 38 +++++---- .../operations.kubeblocks.io_opsrequests.yaml | 20 +++-- .../workloads.kubeblocks.io_instancesets.yaml | 10 ++- docs/developer_docs/api-reference/cluster.md | 12 ++- 12 files changed, 202 insertions(+), 124 deletions(-) create mode 100644 config/samples/apps_v1alpha1_opsdefinition.yaml diff --git a/apis/apps/v1/types.go b/apis/apps/v1/types.go index 3228313f1b1..47e94bca288 100644 --- a/apis/apps/v1/types.go +++ b/apis/apps/v1/types.go @@ -182,12 +182,14 @@ type ServiceRefCredentialSelector struct { } type ClusterComponentVolumeClaimTemplate struct { - // Specifies Labels to override or add for the PVC. + // Specifies the labels for the PVC of the volume. These labels can be overridden + // by labels defined at a higher level in the specification. // // +optional Labels map[string]string `json:"labels,omitempty"` - // Specifies Annotations to override or add for the PVC. + // Specifies the annotations for the PVC of the volume. These annotations can be overridden + // by annotations defined at a higher level in the specification. // // +optional Annotations map[string]string `json:"annotations,omitempty"` diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index 5317aed20ed..c37cbfd94ef 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -980,12 +980,14 @@ type ClusterSwitchPolicy struct { } type ClusterComponentVolumeClaimTemplate struct { - // Specifies Labels to override or add for the PVC. + // Specifies the labels for the PVC of the volume. These labels can be overridden + // by labels defined at a higher level in the specification. // // +optional Labels map[string]string `json:"labels,omitempty"` - // Specifies Annotations to override or add for the PVC. + // Specifies the labels for the PVC of the volume. These labels can be overridden + // by labels defined at a higher level in the specification. // // +optional Annotations map[string]string `json:"annotations,omitempty"` diff --git a/config/crd/bases/apps.kubeblocks.io_clusters.yaml b/config/crd/bases/apps.kubeblocks.io_clusters.yaml index f410a378247..9d7971c31f8 100644 --- a/config/crd/bases/apps.kubeblocks.io_clusters.yaml +++ b/config/crd/bases/apps.kubeblocks.io_clusters.yaml @@ -1864,14 +1864,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -5425,14 +5427,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -10598,14 +10602,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -14200,14 +14206,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for - the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -18354,14 +18362,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -22212,14 +22222,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -27571,14 +27583,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -31474,14 +31488,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for - the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/config/crd/bases/apps.kubeblocks.io_components.yaml b/config/crd/bases/apps.kubeblocks.io_components.yaml index e129d5f7983..05447c19099 100644 --- a/config/crd/bases/apps.kubeblocks.io_components.yaml +++ b/config/crd/bases/apps.kubeblocks.io_components.yaml @@ -1723,14 +1723,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -5676,13 +5678,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add for the - PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -9409,14 +9414,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -13369,13 +13376,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml index 20ec7b514a7..df0155ae36d 100644 --- a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml +++ b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml @@ -2096,14 +2096,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -6689,14 +6691,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml index ff718a93ee8..85d92b9c0ac 100644 --- a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml +++ b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml @@ -1745,14 +1745,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/config/samples/apps_v1alpha1_opsdefinition.yaml b/config/samples/apps_v1alpha1_opsdefinition.yaml new file mode 100644 index 00000000000..0b3af3935b2 --- /dev/null +++ b/config/samples/apps_v1alpha1_opsdefinition.yaml @@ -0,0 +1,6 @@ +apiVersion: apps.kubeblocks.io/v1alpha1 +kind: OpsDefinition +metadata: + name: opsdefinition-sample +spec: + # TODO(user): Add fields here diff --git a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml index f410a378247..9d7971c31f8 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml @@ -1864,14 +1864,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -5425,14 +5427,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -10598,14 +10602,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -14200,14 +14206,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for - the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -18354,14 +18362,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -22212,14 +22222,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -27571,14 +27583,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -31474,14 +31488,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for - the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/deploy/helm/crds/apps.kubeblocks.io_components.yaml b/deploy/helm/crds/apps.kubeblocks.io_components.yaml index e129d5f7983..05447c19099 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_components.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_components.yaml @@ -1723,14 +1723,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -5676,13 +5678,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add for the - PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -9409,14 +9414,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -13369,13 +13376,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml index 20ec7b514a7..df0155ae36d 100755 --- a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml +++ b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml @@ -2096,14 +2096,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- @@ -6689,14 +6691,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override - or add for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or - add for the PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml index ff718a93ee8..85d92b9c0ac 100644 --- a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml +++ b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml @@ -1745,14 +1745,16 @@ spec: annotations: additionalProperties: type: string - description: Specifies Annotations to override or add - for the PVC. + description: |- + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: type: string - description: Specifies Labels to override or add for the - PVC. + description: |- + Specifies the labels for the PVC of the volume. These labels can be overridden + by labels defined at a higher level in the specification. type: object name: description: |- diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md index c2710b2d3f0..c5ec0ebcb19 100644 --- a/docs/developer_docs/api-reference/cluster.md +++ b/docs/developer_docs/api-reference/cluster.md @@ -3214,7 +3214,8 @@ map[string]string (Optional) -

Specifies Labels to override or add for the PVC.

+

Specifies the labels for the PVC of the volume. These labels can be overridden +by labels defined at a higher level in the specification.

@@ -3226,7 +3227,8 @@ map[string]string (Optional) -

Specifies Annotations to override or add for the PVC.

+

Specifies the annotations for the PVC of the volume. These annotations can be overridden +by annotations defined at a higher level in the specification.

@@ -16352,7 +16354,8 @@ map[string]string (Optional) -

Specifies Labels to override or add for the PVC.

+

Specifies the labels for the PVC of the volume. These labels can be overridden +by labels defined at a higher level in the specification.

@@ -16364,7 +16367,8 @@ map[string]string (Optional) -

Specifies Annotations to override or add for the PVC.

+

Specifies the labels for the PVC of the volume. These labels can be overridden +by labels defined at a higher level in the specification.

From d33acd139f7d603db29fb43d43ad2a8ddaef07ad Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Wed, 15 Jan 2025 16:02:45 +0800 Subject: [PATCH 5/6] fix --- apis/apps/v1alpha1/cluster_types.go | 4 ++-- .../crd/bases/apps.kubeblocks.io_clusters.yaml | 16 ++++++++-------- .../crd/bases/apps.kubeblocks.io_components.yaml | 8 ++++---- .../helm/crds/apps.kubeblocks.io_clusters.yaml | 16 ++++++++-------- .../helm/crds/apps.kubeblocks.io_components.yaml | 8 ++++---- docs/developer_docs/api-reference/cluster.md | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index c37cbfd94ef..c8696814c6d 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -986,8 +986,8 @@ type ClusterComponentVolumeClaimTemplate struct { // +optional Labels map[string]string `json:"labels,omitempty"` - // Specifies the labels for the PVC of the volume. These labels can be overridden - // by labels defined at a higher level in the specification. + // Specifies the annotations for the PVC of the volume. These annotations can be overridden + // by annotations defined at a higher level in the specification. // // +optional Annotations map[string]string `json:"annotations,omitempty"` diff --git a/config/crd/bases/apps.kubeblocks.io_clusters.yaml b/config/crd/bases/apps.kubeblocks.io_clusters.yaml index 9d7971c31f8..f21ab2a7220 100644 --- a/config/crd/bases/apps.kubeblocks.io_clusters.yaml +++ b/config/crd/bases/apps.kubeblocks.io_clusters.yaml @@ -18363,8 +18363,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -22223,8 +22223,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -27584,8 +27584,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -31489,8 +31489,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: diff --git a/config/crd/bases/apps.kubeblocks.io_components.yaml b/config/crd/bases/apps.kubeblocks.io_components.yaml index 05447c19099..ee5d1ef2fb0 100644 --- a/config/crd/bases/apps.kubeblocks.io_components.yaml +++ b/config/crd/bases/apps.kubeblocks.io_components.yaml @@ -9415,8 +9415,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -13377,8 +13377,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: diff --git a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml index 9d7971c31f8..f21ab2a7220 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml @@ -18363,8 +18363,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -22223,8 +22223,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -27584,8 +27584,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -31489,8 +31489,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: diff --git a/deploy/helm/crds/apps.kubeblocks.io_components.yaml b/deploy/helm/crds/apps.kubeblocks.io_components.yaml index 05447c19099..ee5d1ef2fb0 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_components.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_components.yaml @@ -9415,8 +9415,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: @@ -13377,8 +13377,8 @@ spec: additionalProperties: type: string description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + Specifies the annotations for the PVC of the volume. These annotations can be overridden + by annotations defined at a higher level in the specification. type: object labels: additionalProperties: diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md index c5ec0ebcb19..5deccf2972b 100644 --- a/docs/developer_docs/api-reference/cluster.md +++ b/docs/developer_docs/api-reference/cluster.md @@ -16367,8 +16367,8 @@ map[string]string (Optional) -

Specifies the labels for the PVC of the volume. These labels can be overridden -by labels defined at a higher level in the specification.

+

Specifies the annotations for the PVC of the volume. These annotations can be overridden +by annotations defined at a higher level in the specification.

From 5b2af6d065cd9b2a6466274783e2af715bc8cc06 Mon Sep 17 00:00:00 2001 From: gnolong <2391353625@qq.com> Date: Fri, 17 Jan 2025 17:23:09 +0800 Subject: [PATCH 6/6] fix --- apis/apps/v1/types.go | 6 +- apis/apps/v1alpha1/cluster_types.go | 6 +- .../bases/apps.kubeblocks.io_clusters.yaml | 78 +++++++------------ .../bases/apps.kubeblocks.io_components.yaml | 34 +++----- .../operations.kubeblocks.io_opsrequests.yaml | 20 ++--- .../workloads.kubeblocks.io_instancesets.yaml | 9 +-- .../crds/apps.kubeblocks.io_clusters.yaml | 78 +++++++------------ .../crds/apps.kubeblocks.io_components.yaml | 34 +++----- .../operations.kubeblocks.io_opsrequests.yaml | 20 ++--- .../workloads.kubeblocks.io_instancesets.yaml | 9 +-- docs/developer_docs/api-reference/cluster.md | 12 +-- 11 files changed, 110 insertions(+), 196 deletions(-) diff --git a/apis/apps/v1/types.go b/apis/apps/v1/types.go index 47e94bca288..c1c21062c6b 100644 --- a/apis/apps/v1/types.go +++ b/apis/apps/v1/types.go @@ -182,14 +182,12 @@ type ServiceRefCredentialSelector struct { } type ClusterComponentVolumeClaimTemplate struct { - // Specifies the labels for the PVC of the volume. These labels can be overridden - // by labels defined at a higher level in the specification. + // Specifies the labels for the PVC of the volume. // // +optional Labels map[string]string `json:"labels,omitempty"` - // Specifies the annotations for the PVC of the volume. These annotations can be overridden - // by annotations defined at a higher level in the specification. + // Specifies the annotations for the PVC of the volume. // // +optional Annotations map[string]string `json:"annotations,omitempty"` diff --git a/apis/apps/v1alpha1/cluster_types.go b/apis/apps/v1alpha1/cluster_types.go index c8696814c6d..a834482bffd 100644 --- a/apis/apps/v1alpha1/cluster_types.go +++ b/apis/apps/v1alpha1/cluster_types.go @@ -980,14 +980,12 @@ type ClusterSwitchPolicy struct { } type ClusterComponentVolumeClaimTemplate struct { - // Specifies the labels for the PVC of the volume. These labels can be overridden - // by labels defined at a higher level in the specification. + // Specifies the labels for the PVC of the volume. // // +optional Labels map[string]string `json:"labels,omitempty"` - // Specifies the annotations for the PVC of the volume. These annotations can be overridden - // by annotations defined at a higher level in the specification. + // Specifies the annotations for the PVC of the volume. // // +optional Annotations map[string]string `json:"annotations,omitempty"` diff --git a/config/crd/bases/apps.kubeblocks.io_clusters.yaml b/config/crd/bases/apps.kubeblocks.io_clusters.yaml index f21ab2a7220..6137f24c032 100644 --- a/config/crd/bases/apps.kubeblocks.io_clusters.yaml +++ b/config/crd/bases/apps.kubeblocks.io_clusters.yaml @@ -1864,16 +1864,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of + the volume. type: object name: description: |- @@ -5427,16 +5425,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -10602,16 +10597,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -14206,16 +14199,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the + volume. type: object name: description: |- @@ -18362,16 +18353,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of + the volume. type: object name: description: |- @@ -22222,16 +22211,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -27583,16 +27569,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -31488,16 +31472,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the + volume. type: object name: description: |- diff --git a/config/crd/bases/apps.kubeblocks.io_components.yaml b/config/crd/bases/apps.kubeblocks.io_components.yaml index ee5d1ef2fb0..9a477d68780 100644 --- a/config/crd/bases/apps.kubeblocks.io_components.yaml +++ b/config/crd/bases/apps.kubeblocks.io_components.yaml @@ -1723,16 +1723,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -5678,16 +5675,12 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -9414,16 +9407,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -13376,16 +13366,12 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- diff --git a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml index df0155ae36d..b0d93ee9ce5 100644 --- a/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml +++ b/config/crd/bases/operations.kubeblocks.io_opsrequests.yaml @@ -2096,16 +2096,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -6691,16 +6689,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- diff --git a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml index 85d92b9c0ac..cc412d803bd 100644 --- a/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml +++ b/config/crd/bases/workloads.kubeblocks.io_instancesets.yaml @@ -1745,16 +1745,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- diff --git a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml index f21ab2a7220..6137f24c032 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_clusters.yaml @@ -1864,16 +1864,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of + the volume. type: object name: description: |- @@ -5427,16 +5425,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -10602,16 +10597,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -14206,16 +14199,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the + volume. type: object name: description: |- @@ -18362,16 +18353,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of + the volume. type: object name: description: |- @@ -22222,16 +22211,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -27583,16 +27569,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -31488,16 +31472,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC + of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the + volume. type: object name: description: |- diff --git a/deploy/helm/crds/apps.kubeblocks.io_components.yaml b/deploy/helm/crds/apps.kubeblocks.io_components.yaml index ee5d1ef2fb0..9a477d68780 100644 --- a/deploy/helm/crds/apps.kubeblocks.io_components.yaml +++ b/deploy/helm/crds/apps.kubeblocks.io_components.yaml @@ -1723,16 +1723,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -5678,16 +5675,12 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -9414,16 +9407,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- @@ -13376,16 +13366,12 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- diff --git a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml index df0155ae36d..b0d93ee9ce5 100755 --- a/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml +++ b/deploy/helm/crds/operations.kubeblocks.io_opsrequests.yaml @@ -2096,16 +2096,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- @@ -6691,16 +6689,14 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the + PVC of the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC + of the volume. type: object name: description: |- diff --git a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml index 85d92b9c0ac..cc412d803bd 100644 --- a/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml +++ b/deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml @@ -1745,16 +1745,13 @@ spec: annotations: additionalProperties: type: string - description: |- - Specifies the annotations for the PVC of the volume. These annotations can be overridden - by annotations defined at a higher level in the specification. + description: Specifies the annotations for the PVC of + the volume. type: object labels: additionalProperties: type: string - description: |- - Specifies the labels for the PVC of the volume. These labels can be overridden - by labels defined at a higher level in the specification. + description: Specifies the labels for the PVC of the volume. type: object name: description: |- diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md index 5deccf2972b..e1e5c398d95 100644 --- a/docs/developer_docs/api-reference/cluster.md +++ b/docs/developer_docs/api-reference/cluster.md @@ -3214,8 +3214,7 @@ map[string]string (Optional) -

Specifies the labels for the PVC of the volume. These labels can be overridden -by labels defined at a higher level in the specification.

+

Specifies the labels for the PVC of the volume.

@@ -3227,8 +3226,7 @@ map[string]string (Optional) -

Specifies the annotations for the PVC of the volume. These annotations can be overridden -by annotations defined at a higher level in the specification.

+

Specifies the annotations for the PVC of the volume.

@@ -16354,8 +16352,7 @@ map[string]string (Optional) -

Specifies the labels for the PVC of the volume. These labels can be overridden -by labels defined at a higher level in the specification.

+

Specifies the labels for the PVC of the volume.

@@ -16367,8 +16364,7 @@ map[string]string (Optional) -

Specifies the annotations for the PVC of the volume. These annotations can be overridden -by annotations defined at a higher level in the specification.

+

Specifies the annotations for the PVC of the volume.