From dcb83cfa11fffebd75f01d7c24ee88e1d2d829f9 Mon Sep 17 00:00:00 2001 From: Niladri Halder Date: Wed, 17 Jul 2024 14:52:38 +0530 Subject: [PATCH] chore: replace CRD with auto-generated copy Signed-off-by: Niladri Halder --- .../helm/charts/charts/crds/templates/zfsnode.yaml | 12 ++++++------ deploy/yamls/zfsnode-crd.yaml | 10 +++++----- deploy/zfs-operator.yaml | 10 +++++----- pkg/apis/openebs.io/zfs/v1/zz_generated.deepcopy.go | 1 + 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/deploy/helm/charts/charts/crds/templates/zfsnode.yaml b/deploy/helm/charts/charts/crds/templates/zfsnode.yaml index cf640ce7c..a7eaf8d95 100644 --- a/deploy/helm/charts/charts/crds/templates/zfsnode.yaml +++ b/deploy/helm/charts/charts/crds/templates/zfsnode.yaml @@ -61,6 +61,10 @@ spec: description: Free specifies the available capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true + name: + description: Name of the zfs pool. + minLength: 1 + type: string used: anyOf: - type: integer @@ -68,18 +72,14 @@ spec: description: Used specifies the used capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - name: - description: Name of the zfs pool. - minLength: 1 - type: string uuid: description: UUID denotes a unique identity of a zfs pool. minLength: 1 type: string required: - free - - used - name + - used - uuid type: object type: array @@ -94,4 +94,4 @@ status: plural: "" conditions: [] storedVersions: [] -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/deploy/yamls/zfsnode-crd.yaml b/deploy/yamls/zfsnode-crd.yaml index 065827955..9dd98708e 100644 --- a/deploy/yamls/zfsnode-crd.yaml +++ b/deploy/yamls/zfsnode-crd.yaml @@ -60,6 +60,10 @@ spec: description: Free specifies the available capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true + name: + description: Name of the zfs pool. + minLength: 1 + type: string used: anyOf: - type: integer @@ -67,18 +71,14 @@ spec: description: Used specifies the used capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - name: - description: Name of the zfs pool. - minLength: 1 - type: string uuid: description: UUID denotes a unique identity of a zfs pool. minLength: 1 type: string required: - free - - used - name + - used - uuid type: object type: array diff --git a/deploy/zfs-operator.yaml b/deploy/zfs-operator.yaml index cda19a1de..8c42495cc 100644 --- a/deploy/zfs-operator.yaml +++ b/deploy/zfs-operator.yaml @@ -1267,6 +1267,10 @@ spec: description: Free specifies the available capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true + name: + description: Name of the zfs pool. + minLength: 1 + type: string used: anyOf: - type: integer @@ -1274,18 +1278,14 @@ spec: description: Used specifies the used capacity of zfs pool. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - name: - description: Name of the zfs pool. - minLength: 1 - type: string uuid: description: UUID denotes a unique identity of a zfs pool. minLength: 1 type: string required: - free - - used - name + - used - uuid type: object type: array diff --git a/pkg/apis/openebs.io/zfs/v1/zz_generated.deepcopy.go b/pkg/apis/openebs.io/zfs/v1/zz_generated.deepcopy.go index 520917e5b..a0214e9d5 100644 --- a/pkg/apis/openebs.io/zfs/v1/zz_generated.deepcopy.go +++ b/pkg/apis/openebs.io/zfs/v1/zz_generated.deepcopy.go @@ -29,6 +29,7 @@ import ( func (in *Pool) DeepCopyInto(out *Pool) { *out = *in out.Free = in.Free.DeepCopy() + out.Used = in.Used.DeepCopy() return }