[DO-1534] Huawei CSI Plugin fix 2 (!25)
[DO-1534] Co-authored-by: denis.patrakeev <denis.patrakeev@avroid.tech> Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/25
This commit is contained in:
Denis Patrakeev
@@ -12,9 +12,6 @@ spec:
|
|||||||
server: https://kubernetes.default.svc
|
server: https://kubernetes.default.svc
|
||||||
namespace: huawei-csi
|
namespace: huawei-csi
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://git.avroid.tech/K8s/k8s-configs.git
|
|
||||||
targetRevision: master
|
|
||||||
path: clusters/k8s-avroid-office.prod.local/namespaces/huawei-csi/kustomize
|
|
||||||
- repoURL: https://git.avroid.tech/K8s/k8s-configs.git
|
- repoURL: https://git.avroid.tech/K8s/k8s-configs.git
|
||||||
targetRevision: master
|
targetRevision: master
|
||||||
ref: values
|
ref: values
|
||||||
@@ -53,3 +50,9 @@ spec:
|
|||||||
clusterResourceWhitelist:
|
clusterResourceWhitelist:
|
||||||
- group: ''
|
- group: ''
|
||||||
kind: Namespace
|
kind: Namespace
|
||||||
|
- group: ''
|
||||||
|
kind: ClusterRole
|
||||||
|
- group: ''
|
||||||
|
kind: ClusterRoleBinding
|
||||||
|
- group: ''
|
||||||
|
kind: CustomResourceDefinition
|
||||||
|
|||||||
@@ -1,155 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
annotations:
|
|
||||||
controller-gen.kubebuilder.io/version: v0.8.0
|
|
||||||
creationTimestamp: null
|
|
||||||
name: storagebackendclaims.xuanwu.huawei.io
|
|
||||||
spec:
|
|
||||||
group: xuanwu.huawei.io
|
|
||||||
names:
|
|
||||||
kind: StorageBackendClaim
|
|
||||||
listKind: StorageBackendClaimList
|
|
||||||
plural: storagebackendclaims
|
|
||||||
shortNames:
|
|
||||||
- sbc
|
|
||||||
singular: storagebackendclaim
|
|
||||||
scope: Namespaced
|
|
||||||
versions:
|
|
||||||
- additionalPrinterColumns:
|
|
||||||
- jsonPath: .status.boundContentName
|
|
||||||
name: StorageBackendContentName
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.storageType
|
|
||||||
name: StorageType
|
|
||||||
priority: 1
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.protocol
|
|
||||||
name: Protocol
|
|
||||||
priority: 1
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.metroBackend
|
|
||||||
name: MetroBackend
|
|
||||||
priority: 1
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.phase
|
|
||||||
name: Status
|
|
||||||
type: string
|
|
||||||
- jsonPath: .metadata.creationTimestamp
|
|
||||||
name: Age
|
|
||||||
type: date
|
|
||||||
name: v1
|
|
||||||
schema:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: StorageBackendClaim is the Schema for the storageBackends 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
|
|
||||||
# After each update of the CRD, be sure to add the following lines.
|
|
||||||
# The role of the following lines is to limit the length of the user-created resource name to no more than 63.
|
|
||||||
# If the length of resource name is greater than 63, an error may occur when adding name information to labels.
|
|
||||||
metadata:
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
maxLength: 63
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: StorageBackendClaimSpec defines the desired state of StorageBackend
|
|
||||||
properties:
|
|
||||||
certSecret:
|
|
||||||
description: CertSecret is the name of the secret that holds the certificate
|
|
||||||
type: string
|
|
||||||
configmapMeta:
|
|
||||||
description: ConfigMapMeta used to config the storage management info,
|
|
||||||
the format is <namespace>/<name>.
|
|
||||||
type: string
|
|
||||||
maxClientThreads:
|
|
||||||
description: maxClientThreads is used to limit the number of storage
|
|
||||||
client request connections
|
|
||||||
type: string
|
|
||||||
parameters:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
description: User defined parameter for extension
|
|
||||||
type: object
|
|
||||||
provider:
|
|
||||||
description: Provider is required in storageBackend, used to filter
|
|
||||||
the provider to add backend
|
|
||||||
type: string
|
|
||||||
secretMeta:
|
|
||||||
description: SecretMeta used to config the storage sensitive info,
|
|
||||||
the format is <namespace>/<name>.
|
|
||||||
type: string
|
|
||||||
useCert:
|
|
||||||
default: false
|
|
||||||
description: UseCert is used to decide whether to use the certificate
|
|
||||||
type: boolean
|
|
||||||
required:
|
|
||||||
- provider
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: StorageBackendClaimStatus defines the observed state of StorageBackend
|
|
||||||
properties:
|
|
||||||
boundContentName:
|
|
||||||
description: BoundContentName is the binding reference
|
|
||||||
type: string
|
|
||||||
certSecret:
|
|
||||||
description: CertSecret is the name of the secret that holds the certificate
|
|
||||||
type: string
|
|
||||||
configmapMeta:
|
|
||||||
description: ConfigmapMeta is current storage configmap namespace
|
|
||||||
and name, format is <namespace>/<name>, such as xuanwu/backup-instance-configmap
|
|
||||||
type: string
|
|
||||||
maxClientThreads:
|
|
||||||
description: maxClientThreads is used to limit the number of storage
|
|
||||||
client request connections
|
|
||||||
type: string
|
|
||||||
metroBackend:
|
|
||||||
description: MetroBackend is the backend that form hyperMetro
|
|
||||||
type: string
|
|
||||||
phase:
|
|
||||||
description: Phase represents the current phase of PersistentVolumeClaim
|
|
||||||
type: string
|
|
||||||
protocol:
|
|
||||||
description: Protocol is used storage protocol
|
|
||||||
type: string
|
|
||||||
secretMeta:
|
|
||||||
description: SecretMeta is current storage secret namespace and name,
|
|
||||||
format is <namespace>/<name>, such as xuanwu/backup-instance-secret
|
|
||||||
type: string
|
|
||||||
storageBackendId:
|
|
||||||
description: StorageBackendId is required in storageBackend, used
|
|
||||||
to filter the provider to add backend
|
|
||||||
type: string
|
|
||||||
storageType:
|
|
||||||
description: StorageType is storage type
|
|
||||||
type: string
|
|
||||||
useCert:
|
|
||||||
description: UseCert is used to decide whether to use the certificate
|
|
||||||
type: boolean
|
|
||||||
required:
|
|
||||||
- configmapMeta
|
|
||||||
- secretMeta
|
|
||||||
- storageBackendId
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
status:
|
|
||||||
acceptedNames:
|
|
||||||
kind: ""
|
|
||||||
plural: ""
|
|
||||||
conditions: []
|
|
||||||
storedVersions: []
|
|
||||||
@@ -1,179 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
annotations:
|
|
||||||
controller-gen.kubebuilder.io/version: v0.8.0
|
|
||||||
creationTimestamp: null
|
|
||||||
name: storagebackendcontents.xuanwu.huawei.io
|
|
||||||
spec:
|
|
||||||
group: xuanwu.huawei.io
|
|
||||||
names:
|
|
||||||
kind: StorageBackendContent
|
|
||||||
listKind: StorageBackendContentList
|
|
||||||
plural: storagebackendcontents
|
|
||||||
shortNames:
|
|
||||||
- sbct
|
|
||||||
singular: storagebackendcontent
|
|
||||||
scope: Cluster
|
|
||||||
versions:
|
|
||||||
- additionalPrinterColumns:
|
|
||||||
- jsonPath: .spec.backendClaim
|
|
||||||
name: Claim
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.sn
|
|
||||||
name: SN
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.vendorName
|
|
||||||
name: VendorName
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.providerVersion
|
|
||||||
name: ProviderVersion
|
|
||||||
type: string
|
|
||||||
- jsonPath: .status.online
|
|
||||||
name: Online
|
|
||||||
type: boolean
|
|
||||||
- jsonPath: .metadata.creationTimestamp
|
|
||||||
name: Age
|
|
||||||
type: date
|
|
||||||
name: v1
|
|
||||||
schema:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: StorageBackendContent is the Schema for the StorageBackendContents
|
|
||||||
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: StorageBackendContentSpec defines the desired state of StorageBackendContent
|
|
||||||
properties:
|
|
||||||
backendClaim:
|
|
||||||
description: BackendClaim is the bound StorageBackendClaim namespace
|
|
||||||
and name, format is <namespace>/<name>.
|
|
||||||
type: string
|
|
||||||
certSecret:
|
|
||||||
description: CertSecret is the name of the secret that holds the certificate
|
|
||||||
type: string
|
|
||||||
configmapMeta:
|
|
||||||
description: ConfigmapMeta is current storage configmap namespace
|
|
||||||
and name, format is <namespace>/<name>. such as xuanwu/backup-instance-configmap
|
|
||||||
type: string
|
|
||||||
maxClientThreads:
|
|
||||||
description: maxClientThreads is used to limit the number of storage
|
|
||||||
client request connections
|
|
||||||
type: string
|
|
||||||
parameters:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
description: User defined parameter for extension
|
|
||||||
type: object
|
|
||||||
provider:
|
|
||||||
description: Provider is required in StorageBackendContent, used to
|
|
||||||
filter the provider to add backend
|
|
||||||
type: string
|
|
||||||
secretMeta:
|
|
||||||
description: SecretMeta is current storage secret namespace and name,
|
|
||||||
format is <namespace>/<name>. such as xuanwu/backup-instance-secret
|
|
||||||
type: string
|
|
||||||
useCert:
|
|
||||||
default: false
|
|
||||||
description: UseCert is used to decide whether to use the certificate
|
|
||||||
type: boolean
|
|
||||||
required:
|
|
||||||
- provider
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: StorageBackendContentStatus defines the observed state of
|
|
||||||
StorageBackendContent
|
|
||||||
properties:
|
|
||||||
capabilities:
|
|
||||||
additionalProperties:
|
|
||||||
type: boolean
|
|
||||||
description: Capabilities get the storage total capacity, used capacity
|
|
||||||
and free capacity.
|
|
||||||
type: object
|
|
||||||
capacity:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
description: Capacity get the storage total capacity, used capacity
|
|
||||||
and free capacity.
|
|
||||||
type: object
|
|
||||||
certSecret:
|
|
||||||
description: CertSecret is the name of the secret that holds the certificate
|
|
||||||
type: string
|
|
||||||
configmapMeta:
|
|
||||||
description: ConfigmapMeta is current storage configmap namespace
|
|
||||||
and name, format is <namespace>/<name>.
|
|
||||||
type: string
|
|
||||||
contentName:
|
|
||||||
description: 'ContentName means the identity of the backend, the format
|
|
||||||
is as follows: provider-name@backend-name#pool-name'
|
|
||||||
type: string
|
|
||||||
maxClientThreads:
|
|
||||||
description: maxClientThreads is used to limit the number of storage
|
|
||||||
client request connections
|
|
||||||
type: string
|
|
||||||
online:
|
|
||||||
description: Online indicates whether the storage login is successful
|
|
||||||
type: boolean
|
|
||||||
pools:
|
|
||||||
description: Pools get all pools storage capacity
|
|
||||||
items:
|
|
||||||
description: Pool is the schema for storage pool capacity
|
|
||||||
properties:
|
|
||||||
capacities:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
providerVersion:
|
|
||||||
description: ProviderVersion means the version of the provider
|
|
||||||
type: string
|
|
||||||
secretMeta:
|
|
||||||
description: SecretMeta is current storage secret namespace and name,
|
|
||||||
format is <namespace>/<name>.
|
|
||||||
type: string
|
|
||||||
sn:
|
|
||||||
description: SN is the unique identifier of a storage device.
|
|
||||||
type: string
|
|
||||||
specification:
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
description: Specification get the storage total specification of
|
|
||||||
used capacity and free capacity.
|
|
||||||
type: object
|
|
||||||
useCert:
|
|
||||||
description: UseCert is used to decide whether to use the certificate
|
|
||||||
type: boolean
|
|
||||||
vendorName:
|
|
||||||
description: VendorName means the flag of the storage vendor, such
|
|
||||||
as EMC/IBM/NetApp/Huawei
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- configmapMeta
|
|
||||||
- secretMeta
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
status:
|
|
||||||
acceptedNames:
|
|
||||||
kind: ""
|
|
||||||
plural: ""
|
|
||||||
conditions: []
|
|
||||||
storedVersions: []
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
apiVersion: kustomize.config.k8s.io/v1beta1
|
|
||||||
kind: Kustomization
|
|
||||||
resources:
|
|
||||||
- crds/backend/xuanwu.huawei.io_storagebackendclaims.yaml
|
|
||||||
- crds/backend/xuanwu.huawei.io_storagebackendcontents.yaml
|
|
||||||
- crds/snapshot-crds/huawei-csi-snapshot-crd-v1.yaml
|
|
||||||
Reference in New Issue
Block a user