fix: fix storage nil err and update operator-go's resourceSpec (#100)

* fix: add missing 'ProductName' parameter to the 'TansformImage' function close #98 * feat(resournces): repalce resourceSpec with operator's * fix(resource): fix nil error when storage size is not specified close #97
zncdatadev · Sep 6, 2024 · 6005a9a · 6005a9a
1 parent 6373edc
commit 6005a9a
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 217 deletions.
diff --git a/.chainsaw.yaml b/.chainsaw.yaml
@@ -3,10 +3,10 @@ kind: Configuration
 metadata:
  name: custom-config
 spec:
- # namespace: test
+ #namespace: test
  timeouts:
- apply: 420s
- assert: 600s
+ apply: 120s
+ assert: 120s
  cleanup: 240s
  delete: 240s
  error: 200s

diff --git a/api/v1alpha1/datanode.go b/api/v1alpha1/datanode.go
@@ -1,6 +1,9 @@
 package v1alpha1
 
-import corev1 "k8s.io/api/core/v1"
+import (
+ commonsv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/commons/v1alpha1"
+ corev1 "k8s.io/api/core/v1"
+)
 
 type DataNodeRoleGroupSpec struct {
  // +kubebuilder:validation:Optional
@@ -22,7 +25,7 @@ type DataNodeRoleGroupSpec struct {
 
 type DataNodeConfigSpec struct {
  // +kubebuilder:validation:Optional
- Resources *ResourcesSpec `json:"resources,omitempty"`
+ Resources *commonsv1alpha1.ResourcesSpec `json:"resources,omitempty"`
 
  // +kubebuilder:validation:Optional
  // +kubebuilder:default="external-unstable"

diff --git a/api/v1alpha1/image.go b/api/v1alpha1/image.go
@@ -47,5 +47,6 @@ func TransformImage(imageSpec *ImageSpec) *util.Image {
  ProductVersion: imageSpec.ProductVersion,
  PullPolicy: imageSpec.PullPolicy,
  PullSecretName: imageSpec.PullSecretName,
+ ProductName: DefaultProductName,
  }
 }
diff --git a/api/v1alpha1/journalnode.go b/api/v1alpha1/journalnode.go
@@ -1,6 +1,9 @@
 package v1alpha1
 
-import corev1 "k8s.io/api/core/v1"
+import (
+ commonsv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/commons/v1alpha1"
+ corev1 "k8s.io/api/core/v1"
+)
 
 type JournalNodeRoleGroupSpec struct {
  // +kubebuilder:validation:Optional
@@ -22,7 +25,7 @@ type JournalNodeRoleGroupSpec struct {
 
 type JournalNodeConfigSpec struct {
  // +kubebuilder:validation:Optional
- Resources *ResourcesSpec `json:"resources,omitempty"`
+ Resources *commonsv1alpha1.ResourcesSpec `json:"resources,omitempty"`
 
  // +kubebuilder:validation:Optional
  // +kubebuilder:default="cluster-internal"

diff --git a/api/v1alpha1/namenode.go b/api/v1alpha1/namenode.go
@@ -1,6 +1,9 @@
 package v1alpha1
 
-import corev1 "k8s.io/api/core/v1"
+import (
+ commonsv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/commons/v1alpha1"
+ corev1 "k8s.io/api/core/v1"
+)
 
 type NameNodeRoleGroupSpec struct {
  // +kubebuilder:validation:Optional
@@ -22,7 +25,7 @@ type NameNodeRoleGroupSpec struct {
 
 type NameNodeConfigSpec struct {
  // +kubebuilder:validation:Optional
- Resources *ResourcesSpec `json:"resources,omitempty"`
+ Resources *commonsv1alpha1.ResourcesSpec `json:"resources,omitempty"`
 
  // +kubebuilder:validation:Optional
  // +kubebuilder:default="external-stable"

diff --git a/api/v1alpha1/resources.go b/api/v1alpha1/resources.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml b/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml
@@ -1259,6 +1259,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass:
@@ -2737,6 +2738,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass:
@@ -4139,6 +4141,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass:
@@ -5534,6 +5537,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass:
@@ -7165,6 +7169,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass:
@@ -8809,6 +8814,7 @@ spec:
  anyOf:
  - type: integer
  - type: string
+ default: 10Gi
  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
  x-kubernetes-int-or-string: true
  storageClass: