From 89c94434b12b297a9e52b403d008358b0de6ed0a Mon Sep 17 00:00:00 2001 From: Kfir Date: Fri, 25 Sep 2020 09:18:53 +0300 Subject: [PATCH] Update CRD to aligned with TopoLVM 0.6.0 --- charts/topolvm/Chart.yaml | 2 +- charts/topolvm/README.md | 2 +- charts/topolvm/templates/crd/crd.yaml | 123 ++++++++++++-------------- 3 files changed, 59 insertions(+), 68 deletions(-) diff --git a/charts/topolvm/Chart.yaml b/charts/topolvm/Chart.yaml index d2e5ffd..2be03fc 100755 --- a/charts/topolvm/Chart.yaml +++ b/charts/topolvm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.6.0 description: Topolvm name: topolvm -version: 1.0.0 +version: 1.0.1 home: https://github.com/topolvm/topolvm sources: - https://github.com/topolvm/helm/tree/master/charts/topolvm diff --git a/charts/topolvm/README.md b/charts/topolvm/README.md index b30b49f..eda3c67 100644 --- a/charts/topolvm/README.md +++ b/charts/topolvm/README.md @@ -24,7 +24,7 @@ The chart can be customized using the following configurable parameters: | Parameter | Description | Default | | ------------------------------- | ----------------------------------------------------------------------------------------------------| -----------------------------| | `image.repository` | TopoLVM Container image name | `quay.io/topolvm/topolvm` | -| `image.tag` | TopoLVM Container image tag | `0.5.3` | +| `image.tag` | TopoLVM Container image tag | `0.6.0` | | `image.pullPolicy` | TopoLVM Container pull policy | `IfNotPresent` | | `controller.replicaCount` | Number of TopoLVM controllers pods to deploy | `2` | | `podSecurityPolicy.create` | Specify if a pod security policy must be created | `true` | diff --git a/charts/topolvm/templates/crd/crd.yaml b/charts/topolvm/templates/crd/crd.yaml index cc3cedf..d4dfc13 100644 --- a/charts/topolvm/templates/crd/crd.yaml +++ b/charts/topolvm/templates/crd/crd.yaml @@ -1,9 +1,9 @@ {{ if .Values.crd.create }} -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.2.7 + controller-gen.kubebuilder.io/version: v0.4.0 creationTimestamp: null name: logicalvolumes.topolvm.cybozu.com labels: @@ -16,74 +16,65 @@ spec: plural: logicalvolumes singular: logicalvolume scope: Cluster - subresources: - status: {} - validation: - openAPIV3Schema: - description: LogicalVolume is the Schema for the logicalvolumes API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: LogicalVolumeSpec defines the desired state of LogicalVolume - properties: - deviceClass: - type: string - name: - description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster - Important: Run "make" to regenerate code after modifying this file' - type: string - nodeName: - type: string - size: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - required: - - name - - nodeName - - size - type: object - status: - description: LogicalVolumeStatus defines the observed state of LogicalVolume - properties: - code: - description: A Code is an unsigned 32-bit error code as defined in the - gRPC spec. - format: int32 - type: integer - currentSize: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - message: - type: string - volumeID: - description: 'INSERT ADDITIONAL STATUS FIELD - define observed state - of cluster Important: Run "make" to regenerate code after modifying - this file' - type: string - type: object - type: object - version: v1 versions: - name: v1 + schema: + openAPIV3Schema: + description: LogicalVolume is the Schema for the logicalvolumes API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: LogicalVolumeSpec defines the desired state of LogicalVolume + properties: + deviceClass: + type: string + name: + description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file' + type: string + nodeName: + type: string + size: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + required: + - name + - nodeName + - size + type: object + status: + description: LogicalVolumeStatus defines the observed state of LogicalVolume + properties: + code: + description: A Code is an unsigned 32-bit error code as defined in the gRPC spec. + format: int32 + type: integer + currentSize: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + message: + type: string + volumeID: + description: 'INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run "make" to regenerate code after modifying this file' + type: string + type: object + type: object served: true storage: true + subresources: + status: {} status: acceptedNames: kind: ""