From 5dfd336f9b4729da3719eb0c660df3dea923370b Mon Sep 17 00:00:00 2001 From: Niu Lechuan Date: Mon, 28 Feb 2022 14:06:05 +0800 Subject: [PATCH] 1. change image name | 2. rename crd --- README.md | 27 ++++- charts/hwameistor/Chart.yaml | 2 +- ...=> hwameistor.io_localdiskclaims_crd.yaml} | 26 ++--- ...yaml => hwameistor.io_localdisks_crd.yaml} | 78 +++++++------- ....hwameistor.io_localstoragealerts_crd.yaml | 81 ++++++++++++++ ....hwameistor.io_localstoragenodes_crd.yaml} | 4 +- ...wameistor.io_localvolumeconverts_crd.yaml} | 4 +- ...hwameistor.io_localvolumeexpands_crd.yaml} | 4 +- ...wameistor.io_localvolumemigrates_crd.yaml} | 4 +- ...wameistor.io_localvolumereplicas_crd.yaml} | 4 +- ...orage.hwameistor.io_localvolumes_crd.yaml} | 4 +- ...rage.hwameistor.io_physicaldisks_crd.yaml} | 4 +- .../local-disk-manager-controller.yaml | 92 ++++++++++++++++ .../templates/local-storage-csi-sidecar.yaml | 4 +- .../templates/local-storage-driver.yaml | 12 +-- .../local-storage-ldm-controller.yaml | 100 ------------------ charts/hwameistor/values.yaml | 15 ++- 17 files changed, 279 insertions(+), 186 deletions(-) rename charts/hwameistor/crds/{hwameistor_localdiskclaims_crd.yaml => hwameistor.io_localdiskclaims_crd.yaml} (95%) rename charts/hwameistor/crds/{hwameistor_localdisks_crd.yaml => hwameistor.io_localdisks_crd.yaml} (83%) create mode 100644 charts/hwameistor/crds/localstorage.hwameistor.io_localstoragealerts_crd.yaml rename charts/hwameistor/crds/{hwameistor_localstoragenodes_crd.yaml => localstorage.hwameistor.io_localstoragenodes_crd.yaml} (98%) rename charts/hwameistor/crds/{hwameistor_localvolumeconverts_crd.yaml => localstorage.hwameistor.io_localvolumeconverts_crd.yaml} (97%) rename charts/hwameistor/crds/{hwameistor_localvolumeexpands_crd.yaml => localstorage.hwameistor.io_localvolumeexpands_crd.yaml} (97%) rename charts/hwameistor/crds/{hwameistor_localvolumemigrates_crd.yaml => localstorage.hwameistor.io_localvolumemigrates_crd.yaml} (97%) rename charts/hwameistor/crds/{hwameistor_localvolumereplicas_crd.yaml => localstorage.hwameistor.io_localvolumereplicas_crd.yaml} (98%) rename charts/hwameistor/crds/{hwameistor_localvolumes_crd.yaml => localstorage.hwameistor.io_localvolumes_crd.yaml} (99%) rename charts/hwameistor/crds/{hwameistor_physicaldisks_crd.yaml => localstorage.hwameistor.io_physicaldisks_crd.yaml} (99%) create mode 100644 charts/hwameistor/templates/local-disk-manager-controller.yaml delete mode 100644 charts/hwameistor/templates/local-storage-ldm-controller.yaml diff --git a/README.md b/README.md index 1e80257..6b1831d 100644 --- 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 +``` + ## Contributing We'd love to have you contribute! diff --git a/charts/hwameistor/Chart.yaml b/charts/hwameistor/Chart.yaml index 9a11ab8..77edef8 100644 --- 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/charts/hwameistor/crds/hwameistor_localdiskclaims_crd.yaml b/charts/hwameistor/crds/hwameistor.io_localdiskclaims_crd.yaml similarity index 95% rename from charts/hwameistor/crds/hwameistor_localdiskclaims_crd.yaml rename to charts/hwameistor/crds/hwameistor.io_localdiskclaims_crd.yaml index 0b33b45..1f5bba4 100644 --- a/charts/hwameistor/crds/hwameistor_localdiskclaims_crd.yaml +++ b/charts/hwameistor/crds/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/charts/hwameistor/crds/hwameistor_localdisks_crd.yaml b/charts/hwameistor/crds/hwameistor.io_localdisks_crd.yaml similarity index 83% rename from charts/hwameistor/crds/hwameistor_localdisks_crd.yaml rename to charts/hwameistor/crds/hwameistor.io_localdisks_crd.yaml index df803e8..0b0f214 100644 --- a/charts/hwameistor/crds/hwameistor_localdisks_crd.yaml +++ b/charts/hwameistor/crds/hwameistor.io_localdisks_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: localdisks.gaea.daocloud.io + name: localdisks.hwameistor.io spec: - group: gaea.daocloud.io + group: hwameistor.io names: kind: LocalDisk listKind: LocalDiskList @@ -14,17 +11,17 @@ spec: 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 new file mode 100644 index 0000000..884e78b --- /dev/null +++ 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/charts/hwameistor/crds/hwameistor_localstoragenodes_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localstoragenodes_crd.yaml similarity index 98% rename from charts/hwameistor/crds/hwameistor_localstoragenodes_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localstoragenodes_crd.yaml index 3c511ab..da426e3 100644 --- a/charts/hwameistor/crds/hwameistor_localstoragenodes_crd.yaml +++ b/charts/hwameistor/crds/localstorage.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/charts/hwameistor/crds/hwameistor_localvolumeconverts_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localvolumeconverts_crd.yaml similarity index 97% rename from charts/hwameistor/crds/hwameistor_localvolumeconverts_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localvolumeconverts_crd.yaml index 9d771f4..e58a3f8 100644 --- a/charts/hwameistor/crds/hwameistor_localvolumeconverts_crd.yaml +++ b/charts/hwameistor/crds/localstorage.hwameistor.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/charts/hwameistor/crds/hwameistor_localvolumeexpands_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localvolumeexpands_crd.yaml similarity index 97% rename from charts/hwameistor/crds/hwameistor_localvolumeexpands_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localvolumeexpands_crd.yaml index c814608..7cf4eb4 100644 --- a/charts/hwameistor/crds/hwameistor_localvolumeexpands_crd.yaml +++ b/charts/hwameistor/crds/localstorage.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/charts/hwameistor/crds/hwameistor_localvolumemigrates_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localvolumemigrates_crd.yaml similarity index 97% rename from charts/hwameistor/crds/hwameistor_localvolumemigrates_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localvolumemigrates_crd.yaml index 3c4a3fe..b4d5d3c 100644 --- a/charts/hwameistor/crds/hwameistor_localvolumemigrates_crd.yaml +++ b/charts/hwameistor/crds/localstorage.hwameistor.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/charts/hwameistor/crds/hwameistor_localvolumereplicas_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localvolumereplicas_crd.yaml similarity index 98% rename from charts/hwameistor/crds/hwameistor_localvolumereplicas_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localvolumereplicas_crd.yaml index 3666883..3d44355 100644 --- a/charts/hwameistor/crds/hwameistor_localvolumereplicas_crd.yaml +++ b/charts/hwameistor/crds/localstorage.hwameistor.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/charts/hwameistor/crds/hwameistor_localvolumes_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_localvolumes_crd.yaml similarity index 99% rename from charts/hwameistor/crds/hwameistor_localvolumes_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_localvolumes_crd.yaml index 67ee87e..ae2b392 100644 --- a/charts/hwameistor/crds/hwameistor_localvolumes_crd.yaml +++ b/charts/hwameistor/crds/localstorage.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 diff --git a/charts/hwameistor/crds/hwameistor_physicaldisks_crd.yaml b/charts/hwameistor/crds/localstorage.hwameistor.io_physicaldisks_crd.yaml similarity index 99% rename from charts/hwameistor/crds/hwameistor_physicaldisks_crd.yaml rename to charts/hwameistor/crds/localstorage.hwameistor.io_physicaldisks_crd.yaml index 2d8283f..25c8ad9 100644 --- a/charts/hwameistor/crds/hwameistor_physicaldisks_crd.yaml +++ b/charts/hwameistor/crds/localstorage.hwameistor.io_physicaldisks_crd.yaml @@ -1,9 +1,9 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: - name: physicaldisks.uds.dce.daocloud.io + name: physicaldisks.localstorage.hwameistor.io spec: - group: uds.dce.daocloud.io + group: localstorage.hwameistor.io names: kind: PhysicalDisk listKind: PhysicalDiskList diff --git a/charts/hwameistor/templates/local-disk-manager-controller.yaml b/charts/hwameistor/templates/local-disk-manager-controller.yaml new file mode 100644 index 0000000..8ceab09 --- /dev/null +++ b/charts/hwameistor/templates/local-disk-manager-controller.yaml @@ -0,0 +1,92 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: local-disk-manager + namespace: {{ .Release.Namespace}} +spec: + selector: + matchLabels: + name: local-disk-manager + template: + metadata: + labels: + name: local-disk-manager + spec: + hostNetwork: true + hostPID: true + serviceAccountName: hwameistor-admin + imagePullSecrets: + - name: daocloudsecret + containers: + - name: local-disk-manager + # Replace this with the built image name + image: {{ .Values.ldmImage}} + command: + - /local-disk-manager + imagePullPolicy: Always + volumeMounts: + - name: udev + mountPath: /run/udev + - name: procmount + mountPath: /host/proc + readOnly: true + - name: devmount + mountPath: /dev + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: OPERATOR_NAME + value: "local-disk-manager" + securityContext: + privileged: true + resources: + limits: + cpu: {{ .Values.ldmResources.limits.cpu}} + memory: {{ .Values.ldmResources.limits.memory}} + requests: + cpu: {{ .Values.ldmResources.requests.cpu}} + memory: {{ .Values.ldmResources.requests.memory}} + volumes: + - name: udev + hostPath: + path: /run/udev + type: Directory + - name: procmount + # mount /proc/1/mounts (mount file of process 1 of host) inside container + # to read which partition is mounted on / path + hostPath: + path: /proc + type: Directory + - name: devmount + # the /dev directory is mounted so that we have access to the devices that + # are connected at runtime of the pod. + hostPath: + path: /dev + type: Directory + tolerations: + - key: CriticalAddonsOnly + operator: Exists + - effect: NoSchedule + key: node.kubernetes.io/not-ready + operator: Exists + - effect: NoSchedule + key: node-role.kubernetes.io/master + operator: Exists + - effect: NoSchedule + key: node.cloudprovider.kubernetes.io/uninitialized + operator: Exists + diff --git a/charts/hwameistor/templates/local-storage-csi-sidecar.yaml b/charts/hwameistor/templates/local-storage-csi-sidecar.yaml index c90fcd3..85fc343 100644 --- a/charts/hwameistor/templates/local-storage-csi-sidecar.yaml +++ b/charts/hwameistor/templates/local-storage-csi-sidecar.yaml @@ -25,7 +25,7 @@ spec: operator: In values: - hwameistor - topologyKey: uds.dce.daocloud.io/local-storage-topology-node + topologyKey: localstorage.hwameistor.io/local-storage-topology-node containers: - args: - --v=5 @@ -117,6 +117,6 @@ spec: operator: Exists volumes: - hostPath: - path: /var/lib/kubelet/plugins/local.storage.daocloud.io + path: /var/lib/kubelet/plugins/local.storage.hwameistor.io type: DirectoryOrCreate name: socket-dir diff --git a/charts/hwameistor/templates/local-storage-driver.yaml b/charts/hwameistor/templates/local-storage-driver.yaml index eda8bd7..7cd1aa7 100644 --- a/charts/hwameistor/templates/local-storage-driver.yaml +++ b/charts/hwameistor/templates/local-storage-driver.yaml @@ -17,13 +17,13 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: csi.driver.uds.dce.daocloud.io/local.storage.daocloud.io + - key: csi.driver.hwameistor.io/localstorage operator: Exists containers: - args: - --v=5 - --csi-address=/csi/csi.sock - - --kubelet-registration-path=/var/lib/kubelet/plugins/local.storage.daocloud.io/csi.sock + - --kubelet-registration-path=/var/lib/kubelet/plugins/localstorage.hwameistor.io/csi.sock env: - name: KUBE_NODE_NAME valueFrom: @@ -38,7 +38,7 @@ spec: command: - /bin/sh - -c - - rm -rf /registration/local.storage.daocloud.io /registration/local.storage.daocloud.io-reg.sock + - rm -rf /registration/localstorage.hwameistor.io /registration/localstorage.hwameistor.io-reg.sock name: registrar resources: limits: @@ -77,9 +77,9 @@ spec: apiVersion: v1 fieldPath: metadata.namespace - name: CSI_ENDPOINT - value: unix://var/lib/kubelet/plugins/local.storage.daocloud.io/csi.sock + value: unix://var/lib/kubelet/plugins/localstorage.hwameistor.io/csi.sock - name: NODE_ANNOTATION_KEY_STORAGE_IPV4 - value: uds.dce.daocloud.io/storage-ipv4 + value: localstorage.hwameistor.io/storage-ipv4 image: {{ .Values.controller.member.image}} imagePullPolicy: IfNotPresent name: member @@ -148,7 +148,7 @@ spec: operator: Exists volumes: - hostPath: - path: /var/lib/kubelet/plugins/local.storage.daocloud.io + path: /var/lib/kubelet/plugins/localstorage.hwameistor.io type: DirectoryOrCreate name: socket-dir - hostPath: diff --git a/charts/hwameistor/templates/local-storage-ldm-controller.yaml b/charts/hwameistor/templates/local-storage-ldm-controller.yaml deleted file mode 100644 index 0bcde89..0000000 --- a/charts/hwameistor/templates/local-storage-ldm-controller.yaml +++ /dev/null @@ -1,100 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: hwameistor-ldm-controller - namespace: {{ .Release.Namespace}} - labels: - control-plane: hwameistor-ldm-controller -spec: - selector: - matchLabels: - control-plane: hwameistor-ldm-controller - template: - metadata: - labels: - control-plane: hwameistor-ldm-controller - spec: - securityContext: - runAsNonRoot: false - containers: - - command: - - /manager - args: - - --leader-elect - image: {{ .Values.ldmImage}} - name: manager - env: - - name: NODENAME - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: spec.nodeName - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - securityContext: - privileged: true - capabilities: - add: [ "SYS_ADMIN" ] - allowPrivilegeEscalation: true - volumeMounts: - - name: udev - mountPath: /run/udev - - name: procmount - mountPath: /host/proc - readOnly: true - - name: devmount - mountPath: /dev - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: - limits: - cpu: {{ .Values.ldmResources.limits.cpu}} - memory: {{ .Values.ldmResources.limits.memory}} - requests: - cpu: {{ .Values.ldmResources.requests.cpu}} - memory: {{ .Values.ldmResources.requests.memory}} - serviceAccountName: hwameistor-admin - serviceAccount: hwameistor-admin - tolerations: - - key: CriticalAddonsOnly - operator: Exists - - effect: NoSchedule - key: node.kubernetes.io/not-ready - operator: Exists - - effect: NoSchedule - key: node-role.kubernetes.io/master - operator: Exists - - effect: NoSchedule - key: node.cloudprovider.kubernetes.io/uninitialized - operator: Exists - volumes: - - name: udev - hostPath: - path: /run/udev - type: Directory - - name: procmount - # mount /proc/1/mounts (mount file of process 1 of host) inside container - # to read which partition is mounted on / path - hostPath: - path: /proc - type: Directory - - name: devmount - # the /dev directory is mounted so that we have access to the devices that - # are connected at runtime of the pod. - hostPath: - path: /dev - type: Directory - terminationGracePeriodSeconds: 10 diff --git a/charts/hwameistor/values.yaml b/charts/hwameistor/values.yaml index eb2222e..6ef0cff 100644 --- a/charts/hwameistor/values.yaml +++ b/charts/hwameistor/values.yaml @@ -1,6 +1,6 @@ hwameistorSchedulerReplicas: 1 schedulerKubeApiServerConfigFilePath: /etc/kubernetes/admin.conf -hwameistorSchedulerImage: daocloud.io/daocloud/dce-kube-scheduler:v1.18.19.1 +hwameistorSchedulerImage: hwameistor/scheduler:v0.0.1 hwameistorSchedulerResources: limits: cpu: 300m @@ -9,7 +9,7 @@ hwameistorSchedulerResources: cpu: 100m memory: 100Mi -ldmImage: 10.6.118.170/library/controller:0.1 +ldmImage: ghcr.io/hwameistor/local-disk-manager:v0.0.1 ldmResources: limits: cpu: 300m @@ -20,7 +20,7 @@ ldmResources: controller: registrar: - image: 10.7.209.48/kube-system/dce-uds-csi-node-driver-registrar:v1.1.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v1.1.0 resources: limits: cpu: 500m @@ -29,7 +29,7 @@ controller: cpu: 5m memory: 5Mi member: - image: daocloud.io/daocloud/dce-uds-local-storage:hwameistor-0.0.1 + image: ghcr.io/hwameistor/local-storage:v0.0.1 resources: limits: cpu: 500m @@ -40,9 +40,8 @@ controller: csidriver: replicas: 1 - serviceAccount: dce-uds-admin provisioner: - image: 10.7.209.48/kube-system/dce-uds-csi-provisioner:v2.0.3 + image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.3 resources: limits: cpu: 500m @@ -51,7 +50,7 @@ csidriver: cpu: 5m memory: 5Mi attacher: - image: 10.7.209.48/kube-system/dce-uds-csi-attacher:v3.0.1 + image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.1 resources: limits: cpu: 500m @@ -60,7 +59,7 @@ csidriver: cpu: 5m memory: 5Mi resizer: - image: 10.7.209.48/kube-system/dce-uds-csi-resizer:v1.0.1 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1 resources: limits: cpu: 500m