From 74f64babfaa73f2893bc8dc9d19781b76702c141 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 22 Aug 2024 10:12:24 +0530 Subject: [PATCH] csv: update the csv in release-4.17 branch due to some merge conflict during manual sync raising this pr to add the csv. Signed-off-by: subhamkrai --- ....rook.io_cephblockpoolradosnamespaces.yaml | 2 +- .../csv/ceph/ceph.rook.io_cephblockpools.yaml | 2 +- .../ceph.rook.io_cephbucketnotifications.yaml | 2 +- .../ceph/ceph.rook.io_cephbuckettopics.yaml | 2 +- build/csv/ceph/ceph.rook.io_cephclients.yaml | 2 +- build/csv/ceph/ceph.rook.io_cephclusters.yaml | 12 ++- .../ceph/ceph.rook.io_cephcosidrivers.yaml | 4 +- .../ceph.rook.io_cephfilesystemmirrors.yaml | 4 +- .../ceph/ceph.rook.io_cephfilesystems.yaml | 6 +- ...rook.io_cephfilesystemsubvolumegroups.yaml | 2 +- build/csv/ceph/ceph.rook.io_cephnfses.yaml | 7 +- .../ceph/ceph.rook.io_cephobjectrealms.yaml | 2 +- .../ceph/ceph.rook.io_cephobjectstores.yaml | 78 ++++++++++++++++++- .../ceph.rook.io_cephobjectstoreusers.yaml | 2 +- .../ceph.rook.io_cephobjectzonegroups.yaml | 2 +- .../ceph/ceph.rook.io_cephobjectzones.yaml | 2 +- .../csv/ceph/ceph.rook.io_cephrbdmirrors.yaml | 4 +- ...k-ceph-operator.clusterserviceversion.yaml | 62 ++++++++++++--- 18 files changed, 171 insertions(+), 26 deletions(-) diff --git a/build/csv/ceph/ceph.rook.io_cephblockpoolradosnamespaces.yaml b/build/csv/ceph/ceph.rook.io_cephblockpoolradosnamespaces.yaml index e90250cb6bea..24f47ea9d4a5 100644 --- a/build/csv/ceph/ceph.rook.io_cephblockpoolradosnamespaces.yaml +++ b/build/csv/ceph/ceph.rook.io_cephblockpoolradosnamespaces.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephblockpoolradosnamespaces.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephblockpools.yaml b/build/csv/ceph/ceph.rook.io_cephblockpools.yaml index 1a87863bcea0..f82d46db40e8 100644 --- a/build/csv/ceph/ceph.rook.io_cephblockpools.yaml +++ b/build/csv/ceph/ceph.rook.io_cephblockpools.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephblockpools.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephbucketnotifications.yaml b/build/csv/ceph/ceph.rook.io_cephbucketnotifications.yaml index d9a377fc83fb..f9d0fa2e81b6 100644 --- a/build/csv/ceph/ceph.rook.io_cephbucketnotifications.yaml +++ b/build/csv/ceph/ceph.rook.io_cephbucketnotifications.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephbucketnotifications.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephbuckettopics.yaml b/build/csv/ceph/ceph.rook.io_cephbuckettopics.yaml index 18a2a43f6b32..e854f5f8d637 100644 --- a/build/csv/ceph/ceph.rook.io_cephbuckettopics.yaml +++ b/build/csv/ceph/ceph.rook.io_cephbuckettopics.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephbuckettopics.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephclients.yaml b/build/csv/ceph/ceph.rook.io_cephclients.yaml index 7869729e17cf..2a3ab74c3c8a 100644 --- a/build/csv/ceph/ceph.rook.io_cephclients.yaml +++ b/build/csv/ceph/ceph.rook.io_cephclients.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephclients.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephclusters.yaml b/build/csv/ceph/ceph.rook.io_cephclusters.yaml index 1c76ccee2c36..db2978259122 100644 --- a/build/csv/ceph/ceph.rook.io_cephclusters.yaml +++ b/build/csv/ceph/ceph.rook.io_cephclusters.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephclusters.ceph.rook.io spec: @@ -252,6 +252,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -339,6 +340,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1495,6 +1497,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -1554,6 +1558,8 @@ spec: properties: allowDeviceClassUpdate: type: boolean + allowOsdCrushWeightUpdate: + type: boolean backfillFullRatio: maximum: 1 minimum: 0 @@ -1638,6 +1644,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -2830,6 +2838,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object diff --git a/build/csv/ceph/ceph.rook.io_cephcosidrivers.yaml b/build/csv/ceph/ceph.rook.io_cephcosidrivers.yaml index 6003df89d5af..cfa3949c3a84 100644 --- a/build/csv/ceph/ceph.rook.io_cephcosidrivers.yaml +++ b/build/csv/ceph/ceph.rook.io_cephcosidrivers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephcosidrivers.ceph.rook.io spec: @@ -554,6 +554,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object diff --git a/build/csv/ceph/ceph.rook.io_cephfilesystemmirrors.yaml b/build/csv/ceph/ceph.rook.io_cephfilesystemmirrors.yaml index 939d93893790..37fdd7d7e653 100644 --- a/build/csv/ceph/ceph.rook.io_cephfilesystemmirrors.yaml +++ b/build/csv/ceph/ceph.rook.io_cephfilesystemmirrors.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephfilesystemmirrors.ceph.rook.io spec: @@ -563,6 +563,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object diff --git a/build/csv/ceph/ceph.rook.io_cephfilesystems.yaml b/build/csv/ceph/ceph.rook.io_cephfilesystems.yaml index 277298c06ca4..fce67dc19fa6 100644 --- a/build/csv/ceph/ceph.rook.io_cephfilesystems.yaml +++ b/build/csv/ceph/ceph.rook.io_cephfilesystems.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephfilesystems.ceph.rook.io spec: @@ -345,6 +345,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -928,6 +929,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -976,6 +979,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/build/csv/ceph/ceph.rook.io_cephfilesystemsubvolumegroups.yaml b/build/csv/ceph/ceph.rook.io_cephfilesystemsubvolumegroups.yaml index c0e7aebade7e..30e38a5a0ed9 100644 --- a/build/csv/ceph/ceph.rook.io_cephfilesystemsubvolumegroups.yaml +++ b/build/csv/ceph/ceph.rook.io_cephfilesystemsubvolumegroups.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephfilesystemsubvolumegroups.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephnfses.yaml b/build/csv/ceph/ceph.rook.io_cephnfses.yaml index 2dfb9259624b..2c5a69d5b4d0 100644 --- a/build/csv/ceph/ceph.rook.io_cephnfses.yaml +++ b/build/csv/ceph/ceph.rook.io_cephnfses.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephnfses.ceph.rook.io spec: @@ -808,6 +808,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -1123,6 +1125,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1708,6 +1711,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object diff --git a/build/csv/ceph/ceph.rook.io_cephobjectrealms.yaml b/build/csv/ceph/ceph.rook.io_cephobjectrealms.yaml index 7f13f7a34010..7dd5ce07e00b 100644 --- a/build/csv/ceph/ceph.rook.io_cephobjectrealms.yaml +++ b/build/csv/ceph/ceph.rook.io_cephobjectrealms.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephobjectrealms.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml b/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml index df27711b0ab7..9bb9dee6b533 100644 --- a/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml +++ b/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephobjectstores.ceph.rook.io spec: @@ -43,6 +43,33 @@ spec: items: type: string type: array + auth: + properties: + keystone: + nullable: true + properties: + acceptedRoles: + items: + type: string + type: array + implicitTenants: + type: string + revocationInterval: + nullable: true + type: integer + serviceUserSecretName: + type: string + tokenCacheSize: + nullable: true + type: integer + url: + type: string + required: + - acceptedRoles + - serviceUserSecretName + - url + type: object + type: object dataPool: nullable: true properties: @@ -740,6 +767,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -809,6 +838,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -895,6 +925,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -959,7 +990,26 @@ spec: type: object type: object hosting: + nullable: true properties: + advertiseEndpoint: + nullable: true + properties: + dnsName: + minLength: 1 + type: string + port: + format: int32 + maximum: 65535 + minimum: 1 + type: integer + useTls: + type: boolean + required: + - dnsName + - port + - useTls + type: object dnsNames: items: type: string @@ -1097,6 +1147,32 @@ spec: type: object preservePoolsOnDelete: type: boolean + protocols: + properties: + s3: + nullable: true + properties: + authUseKeystone: + nullable: true + type: boolean + enabled: + nullable: true + type: boolean + type: object + swift: + nullable: true + properties: + accountInUrl: + nullable: true + type: boolean + urlPrefix: + nullable: true + type: string + versioningEnabled: + nullable: true + type: boolean + type: object + type: object security: nullable: true properties: diff --git a/build/csv/ceph/ceph.rook.io_cephobjectstoreusers.yaml b/build/csv/ceph/ceph.rook.io_cephobjectstoreusers.yaml index ea3f4c6f0b53..31090140268f 100644 --- a/build/csv/ceph/ceph.rook.io_cephobjectstoreusers.yaml +++ b/build/csv/ceph/ceph.rook.io_cephobjectstoreusers.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephobjectstoreusers.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephobjectzonegroups.yaml b/build/csv/ceph/ceph.rook.io_cephobjectzonegroups.yaml index 87bc226619b0..bf0a5c6ab6c7 100644 --- a/build/csv/ceph/ceph.rook.io_cephobjectzonegroups.yaml +++ b/build/csv/ceph/ceph.rook.io_cephobjectzonegroups.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephobjectzonegroups.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml b/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml index ef6b78cf5f42..f5946e3142e8 100644 --- a/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml +++ b/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephobjectzones.ceph.rook.io spec: diff --git a/build/csv/ceph/ceph.rook.io_cephrbdmirrors.yaml b/build/csv/ceph/ceph.rook.io_cephrbdmirrors.yaml index fa690789cd27..58a375f8c369 100644 --- a/build/csv/ceph/ceph.rook.io_cephrbdmirrors.yaml +++ b/build/csv/ceph/ceph.rook.io_cephrbdmirrors.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 creationTimestamp: null name: cephrbdmirrors.ceph.rook.io spec: @@ -577,6 +577,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml index f4c93a80e837..a1cadeaaa6e3 100644 --- a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml +++ b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml @@ -2397,6 +2397,50 @@ spec: - customresourcedefinitions verbs: - get + - apiGroups: + - csi.ceph.io + resources: + - cephconnections + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - csi.ceph.io + resources: + - clientprofiles + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - csi.ceph.io + resources: + - operatorconfigs + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - csi.ceph.io + resources: + - drivers + verbs: + - create + - delete + - get + - list + - update + - watch serviceAccountName: rook-ceph-system - rules: - apiGroups: @@ -2452,6 +2496,14 @@ spec: - get - list - watch + - apiGroups: + - storage.k8s.io + resources: + - csinodes + verbs: + - get + - list + - watch - apiGroups: - "" resources: @@ -2945,14 +2997,6 @@ spec: - get - list - watch - - apiGroups: - - storage.k8s.io - resources: - - csinodes - verbs: - - get - - list - - watch serviceAccountName: rook-csi-rbd-provisioner-sa - rules: - verbs: @@ -3113,7 +3157,7 @@ spec: fieldPath: metadata.namespace - name: ROOK_OBC_WATCH_OPERATOR_NAMESPACE value: "true" - image: docker.io/rook/ceph:v1.13.0.399.g9c0d795e2 + image: docker.io/rook/ceph:v1.15.0 name: rook-ceph-operator resources: {} securityContext: