Merge pull request #3 from niulechuan/helm-rename

Change image name and rename crds
sun7927 · Feb 28, 2022 · 2508d32 · 2508d32
2 parents 8e86771 + 5dfd336
commit 2508d32
Show file tree

Hide file tree

Showing 17 changed files with 279 additions and 186 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # HwameiStor Kubernetes Helm Charts
 
-[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/charts-test-1)](https://artifacthub.io/packages/search?repo=charts-test-1) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5624/badge)](https://bestpractices.coreinfrastructure.org/projects/5624)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5685/badge)](https://bestpractices.coreinfrastructure.org/projects/5685) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hwameistor)](https://artifacthub.io/packages/search?repo=hwameistor)
+
 
 This functionality is in alpha and is subject to change. The code is provided as-is with no warranties. Alpha features are not subject to the support SLA of official GA features.
 
@@ -12,13 +13,35 @@ Please refer to Helm's [documentation](https://helm.sh/docs/) to get started.
 Once Helm is set up properly, add the repo as follows:
 
 ```console
-$ helm repo add hwameistor https://github.com/HwameiStor/helm-charts
+$ git clone https://github.com/hwameistor/helm-charts.git
+```
+
+```console
+$ cd helm-charts/charts
+```
+
+```console
+$ helm install hwameistor -n hwameistor --create-namespace --generate-name
+```
+
+or:
+
+```console
+$ helm repo add hwameistor https://github.com/hwameistor/helm-charts
+```
 
+```console
 $ helm install hwameistor -n hwameistor --create-namespace --generate-name
 ```
 
 You can then run `helm search repo hwameistor` to see the charts.
 
+Once the Helm charts was installed. You should enable HwameiStor on specific nodes as follows:
+
+```console
+$ ./enable-hwameistor-on-node.sh <node01,node02> <HDD,SSD>
+```
+
 ## Contributing
 
 We'd love to have you contribute!

diff --git a/charts/hwameistor/Chart.yaml b/charts/hwameistor/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: hwameistor
 description: the HwameiStor local storage
 type: application
-version: 0.2.2
+version: 0.2.3
 appVersion:
diff --git a/.../crds/hwameistor_localdiskclaims_crd.yaml → ...ds/hwameistor.io_localdiskclaims_crd.yaml b/.../crds/hwameistor_localdiskclaims_crd.yaml → ...ds/hwameistor.io_localdiskclaims_crd.yaml
@@ -1,12 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
-  creationTimestamp: null
-  name: localdiskclaims.gaea.daocloud.io
+  name: localdiskclaims.hwameistor.io
 spec:
-  group: gaea.daocloud.io
+  group: hwameistor.io
   names:
     kind: LocalDiskClaim
     listKind: LocalDiskClaimList
@@ -18,10 +15,10 @@ spec:
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.nodeName
-      name: NodeName
+      name: NodeMatch
       type: string
     - jsonPath: .status.status
-      name: Status
+      name: Phase
       type: string
     name: v1alpha1
     schema:
@@ -46,6 +43,10 @@ spec:
               description:
                 description: Description of the disk to be claimed
                 properties:
+                  capacity:
+                    description: Capacity of the disk in bytes
+                    format: int64
+                    type: integer
                   diskType:
                     description: DiskType represents the type of drive like SSD, HDD
                       etc.,
@@ -117,6 +118,8 @@ spec:
               nodeName:
                 description: NodeName represents where disk has to be claimed.
                 type: string
+            required:
+            - nodeName
             type: object
           status:
             description: LocalDiskClaimStatus defines the observed state of LocalDiskClaim
@@ -128,11 +131,4 @@ spec:
         type: object
     served: true
     storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources: {}
diff --git a/...istor/crds/hwameistor_localdisks_crd.yaml → ...or/crds/hwameistor.io_localdisks_crd.yaml b/...istor/crds/hwameistor_localdisks_crd.yaml → ...or/crds/hwameistor.io_localdisks_crd.yaml
@@ -1,30 +1,27 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
-  creationTimestamp: null
-  name: localdisks.gaea.daocloud.io
+  name: localdisks.hwameistor.io
 spec:
-  group: gaea.daocloud.io
+  group: hwameistor.io
   names:
     kind: LocalDisk
     listKind: LocalDiskList
     plural: localdisks
     shortNames:
     - ld
     singular: localdisk
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.nodeName
-      name: NodeName
+      name: NodeMatch
       type: string
     - jsonPath: .spec.claimRef.name
       name: Claim
       type: string
     - jsonPath: .status.claimState
-      name: Status
+      name: Phase
       type: string
     name: v1alpha1
     schema:
@@ -94,6 +91,10 @@ spec:
                 description: DiskAttributes has hardware/static attributes of the
                   disk
                 properties:
+                  devType:
+                    description: DeviceType represents the type of device like sparse,
+                      disk, partition, lvm, crypt
+                    type: string
                   formFactor:
                     description: FormFactor is the disk size, like 2.5 inches
                     type: string
@@ -134,28 +135,34 @@ spec:
                 type: string
               partitionInfo:
                 description: PartitionInfo contains partition information
-                properties:
-                  filesystem:
-                    description: FileSystem contains mount point and filesystem type
-                    properties:
-                      fsType:
-                        description: Type represents the FileSystem type of the disk
-                        type: string
-                      mountPoint:
-                        description: MountPoint represents the mountpoint of the disk
-                        type: string
-                    type: object
-                  hasFileSystem:
-                    description: HasFileSystem represents whether the filesystem is
-                      included
-                    type: boolean
-                  path:
-                    description: Path represents the partition path in the OS
-                    type: string
-                required:
-                - hasFileSystem
-                - path
-                type: object
+                items:
+                  description: PartitionInfo contains partition information(e.g. FileSystem)
+                  properties:
+                    filesystem:
+                      description: FileSystem contains mount point and filesystem
+                        type
+                      properties:
+                        fsType:
+                          description: Type represents the FileSystem type of the
+                            disk
+                          type: string
+                        mountPoint:
+                          description: MountPoint represents the mountpoint of the
+                            disk
+                          type: string
+                      type: object
+                    hasFileSystem:
+                      description: HasFileSystem represents whether the filesystem
+                        is included
+                      type: boolean
+                    path:
+                      description: Path represents the partition path in the OS
+                      type: string
+                  required:
+                  - hasFileSystem
+                  - path
+                  type: object
+                type: array
               partitioned:
                 description: HasPartition represents if the disk has partitions or
                   not
@@ -192,6 +199,8 @@ spec:
               uuid:
                 description: UUID global unique identifier of the disk
                 type: string
+            required:
+            - nodeName
             type: object
           status:
             description: LocalDiskStatus defines the observed state of LocalDisk
@@ -207,11 +216,4 @@ spec:
         type: object
     served: true
     storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    subresources: {}
diff --git a/charts/hwameistor/crds/localstorage.hwameistor.io_localstoragealerts_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localstoragealerts_crd.yaml
@@ -0,0 +1,81 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: localstoragealerts.localstorage.hwameistor.io
+spec:
+  group: localstorage.hwameistor.io
+  names:
+    kind: LocalStorageAlert
+    listKind: LocalStorageAlertList
+    plural: localstoragealerts
+    shortNames:
+    - lsalert
+    singular: localstoragealert
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - description: Alert severity
+      jsonPath: .spec.severity
+      name: severity
+      type: integer
+    - description: Module of the alert
+      jsonPath: .spec.module
+      name: module
+      type: string
+    - description: Resource name of the alert
+      jsonPath: .spec.resource
+      name: resource
+      type: string
+    - description: Alert event
+      jsonPath: .spec.event
+      name: event
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: LocalStorageAlert is the Schema for the localstoragealerts 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: LocalStorageAlertSpec defines the desired state of LocalStorageAlert
+            properties:
+              details:
+                type: string
+              event:
+                type: string
+              module:
+                type: string
+              resource:
+                type: string
+              severity:
+                description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+                  Important: Run "operator-sdk generate k8s" to regenerate code after
+                  modifying this file Add custom validation using kubebuilder tags:
+                  https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html'
+                type: integer
+            required:
+            - details
+            - event
+            - module
+            - resource
+            - severity
+            type: object
+          status:
+            description: LocalStorageAlertStatus defines the observed state of LocalStorageAlert
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/...rds/hwameistor_localstoragenodes_crd.yaml → ....hwameistor.io_localstoragenodes_crd.yaml b/...rds/hwameistor_localstoragenodes_crd.yaml → ....hwameistor.io_localstoragenodes_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localstoragenodes.uds.dce.daocloud.io
+  name: localstoragenodes.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalStorageNode
     listKind: LocalStorageNodeList

diff --git a/...s/hwameistor_localvolumeconverts_crd.yaml → ...wameistor.io_localvolumeconverts_crd.yaml b/...s/hwameistor_localvolumeconverts_crd.yaml → ...wameistor.io_localvolumeconverts_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localvolumeconverts.uds.dce.daocloud.io
+  name: localvolumeconverts.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalVolumeConvert
     listKind: LocalVolumeConvertList

diff --git a/...ds/hwameistor_localvolumeexpands_crd.yaml → ...hwameistor.io_localvolumeexpands_crd.yaml b/...ds/hwameistor_localvolumeexpands_crd.yaml → ...hwameistor.io_localvolumeexpands_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localvolumeexpands.uds.dce.daocloud.io
+  name: localvolumeexpands.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalVolumeExpand
     listKind: LocalVolumeExpandList

diff --git a/...s/hwameistor_localvolumemigrates_crd.yaml → ...wameistor.io_localvolumemigrates_crd.yaml b/...s/hwameistor_localvolumemigrates_crd.yaml → ...wameistor.io_localvolumemigrates_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localvolumemigrates.uds.dce.daocloud.io
+  name: localvolumemigrates.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalVolumeMigrate
     listKind: LocalVolumeMigrateList

diff --git a/...s/hwameistor_localvolumereplicas_crd.yaml → ...wameistor.io_localvolumereplicas_crd.yaml b/...s/hwameistor_localvolumereplicas_crd.yaml → ...wameistor.io_localvolumereplicas_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localvolumereplicas.uds.dce.daocloud.io
+  name: localvolumereplicas.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalVolumeReplica
     listKind: LocalVolumeReplicaList

diff --git a/...tor/crds/hwameistor_localvolumes_crd.yaml → ...orage.hwameistor.io_localvolumes_crd.yaml b/...tor/crds/hwameistor_localvolumes_crd.yaml → ...orage.hwameistor.io_localvolumes_crd.yaml
@@ -1,9 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: localvolumes.uds.dce.daocloud.io
+  name: localvolumes.localstorage.hwameistor.io
 spec:
-  group: uds.dce.daocloud.io
+  group: localstorage.hwameistor.io
   names:
     kind: LocalVolume
     listKind: LocalVolumeList