chore: fix deploy/helm and addon_types format (#5804)

apecloud · Nov 9, 2023 · 1f0ecab · 1f0ecab
1 parent 8691103
commit 1f0ecab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/apis/extensions/v1alpha1/addon_types.go b/apis/extensions/v1alpha1/addon_types.go
@@ -95,7 +95,7 @@ type SelectorRequirement struct {
 	// The selector key. Valid values are KubeVersion, KubeGitVersion and KubeProvider.
 	// "KubeVersion" the semver expression of Kubernetes versions, i.e., v1.24.
 	// "KubeGitVersion" may contain distro. info., i.e., v1.24.4+eks.
-	// "KubeProvider" the Kubernetes provider, i.e., aws,gcp,azure,huaweiCloud,tencentCloud etc.
+	// "KubeProvider" the Kubernetes provider, i.e., aws, gcp, azure, huaweiCloud, tencentCloud etc.
 	// +kubebuilder:validation:Required
 	Key AddonSelectorKey `json:"key"`
 

diff --git a/config/crd/bases/extensions.kubeblocks.io_addons.yaml b/config/crd/bases/extensions.kubeblocks.io_addons.yaml
@@ -174,8 +174,8 @@ spec:
                               KubeGitVersion and KubeProvider. "KubeVersion" the semver
                               expression of Kubernetes versions, i.e., v1.24. "KubeGitVersion"
                               may contain distro. info., i.e., v1.24.4+eks. "KubeProvider"
-                              the Kubernetes provider, i.e., aws,gcp,azure,huaweiCloud,tencentCloud
-                              etc.
+                              the Kubernetes provider, i.e., aws, gcp, azure, huaweiCloud,
+                              tencentCloud etc.
                             enum:
                             - KubeGitVersion
                             - KubeVersion
@@ -567,8 +567,8 @@ spec:
                             KubeGitVersion and KubeProvider. "KubeVersion" the semver
                             expression of Kubernetes versions, i.e., v1.24. "KubeGitVersion"
                             may contain distro. info., i.e., v1.24.4+eks. "KubeProvider"
-                            the Kubernetes provider, i.e., aws,gcp,azure,huaweiCloud,tencentCloud
-                            etc.
+                            the Kubernetes provider, i.e., aws, gcp, azure, huaweiCloud,
+                            tencentCloud etc.
                           enum:
                           - KubeGitVersion
                           - KubeVersion

diff --git a/deploy/helm/crds/extensions.kubeblocks.io_addons.yaml b/deploy/helm/crds/extensions.kubeblocks.io_addons.yaml
@@ -174,8 +174,8 @@ spec:
                               KubeGitVersion and KubeProvider. "KubeVersion" the semver
                               expression of Kubernetes versions, i.e., v1.24. "KubeGitVersion"
                               may contain distro. info., i.e., v1.24.4+eks. "KubeProvider"
-                              the Kubernetes provider, i.e., aws,gcp,azure,huaweiCloud,tencentCloud
-                              etc.
+                              the Kubernetes provider, i.e., aws, gcp, azure, huaweiCloud,
+                              tencentCloud etc.
                             enum:
                             - KubeGitVersion
                             - KubeVersion
@@ -567,8 +567,8 @@ spec:
                             KubeGitVersion and KubeProvider. "KubeVersion" the semver
                             expression of Kubernetes versions, i.e., v1.24. "KubeGitVersion"
                             may contain distro. info., i.e., v1.24.4+eks. "KubeProvider"
-                            the Kubernetes provider, i.e., aws,gcp,azure,huaweiCloud,tencentCloud
-                            etc.
+                            the Kubernetes provider, i.e., aws, gcp, azure, huaweiCloud,
+                            tencentCloud etc.
                           enum:
                           - KubeGitVersion
                           - KubeVersion

diff --git a/deploy/helm/templates/storageclass.yaml b/deploy/helm/templates/storageclass.yaml
@@ -2,7 +2,6 @@
 {{- if and $scName .Values.storageClass.create }}
 {{- $cloudProvider := (include "kubeblocks.cloudProvider" .) }}
 {{- if eq $cloudProvider "aws" }}
----
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -19,7 +18,6 @@ reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
 ---
 {{- else if eq $cloudProvider "gcp" }}
----
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -36,7 +34,6 @@ reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
 ---
 {{- else if eq $cloudProvider "aliyun" }}
----
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -53,7 +50,6 @@ reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
 ---
 {{- else if eq $cloudProvider "tencentCloud" }}
----
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
@@ -68,7 +64,6 @@ provisioner: com.tencent.cloud.csi.cbs
 volumeBindingMode: WaitForFirstConsumer
 ---
 {{- else if eq $cloudProvider "azure" }}
----
 ## it doesn't work here because aks does not support .Capabilities.KubeVersion.GitVersion to judge the provider.
 ## refer: https://github.com/Azure/AKS/issues/3375
 apiVersion: storage.k8s.io/v1
@@ -87,7 +82,6 @@ reclaimPolicy: Delete
 volumeBindingMode: WaitForFirstConsumer
 ---
 {{- else if eq $cloudProvider "huaweiCloud" }} # huawei cloud
----
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata: