fix: remove field resourceConstraintRef (#4366)

(cherry picked from commit 56053d5)
apecloud · Jul 19, 2023 · aa2e2dd · aa2e2dd
1 parent f6cc6e6
commit aa2e2dd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git a/deploy/apecloud-mysql/templates/class.yaml b/deploy/apecloud-mysql/templates/class.yaml
@@ -8,8 +8,7 @@ metadata:
     clusterdefinition.kubeblocks.io/name: apecloud-mysql
 spec:
   groups:
-  - resourceConstraintRef: kb-resource-constraint-general
-    template: |
+  - template: |
       cpu: {{ printf "{{ .cpu }}" }}
       memory: {{ printf "{{ .memory }}Gi" }}
     vars: [ cpu, memory]
@@ -28,8 +27,7 @@ spec:
       - args: [ "64", "256"]
       - args: [ "128", "512"]
 
-  - resourceConstraintRef: kb-resource-constraint-memory-optimized
-    template: |
+  - template: |
       cpu: {{ printf "{{ .cpu }}" }}
       memory: {{ printf "{{ .memory }}Gi" }}
     vars: [ cpu, memory]

diff --git a/deploy/helm/templates/class/componentclassconstraint.yaml b/deploy/helm/templates/class/componentclassconstraint.yaml
@@ -18,9 +18,3 @@ spec:
     storage:
       min: 20Gi
       max: 10Ti
-  selector:
-  - clusterDefRef: apecloud-mysql
-    components:
-    - componentDefRef: mysql
-      constraints:
-      - "general"
diff --git a/internal/cli/cmd/class/template.go b/internal/cli/cmd/class/template.go
@@ -30,8 +30,7 @@ import (
 )
 
 const ComponentClassTemplate = `
-- resourceConstraintRef: kb-resource-constraint-general
-  # class template, you can declare variables and set default values here
+- # class template, you can declare variables and set default values here
   template: |
     cpu: "{{ or .cpu 1 }}"
     memory: "{{ or .memory 4 }}Gi"

diff --git a/internal/cli/testing/testdata/class.yaml b/internal/cli/testing/testdata/class.yaml
@@ -8,9 +8,7 @@ metadata:
     clusterdefinition.kubeblocks.io/name: apecloud-mysql
 spec:
   groups:
-  - # resource constraint name, such as general, memory-optimized, cpu-optimized etc.
-    resourceConstraintRef: kb-resource-constraint-general
-    # class schema template, you can set default resource values here
+  - # class schema template, you can set default resource values here
     template: |
       cpu: "{{ .cpu }}"
       memory: "{{ .memory }}Gi"
@@ -36,8 +34,7 @@ spec:
       - args: [ "64", "256"]
       - args: [ "128", "512"]
 
-  - resourceConstraintRef: kb-resource-constraint-memory-optimized
-    template: |
+  - template: |
       cpu: "{{ .cpu }}"
       memory: "{{ .memory }}Gi"
     vars: [ cpu, memory]

diff --git a/internal/cli/testing/testdata/custom_class.yaml b/internal/cli/testing/testdata/custom_class.yaml
@@ -1,5 +1,4 @@
-  - resourceConstraintRef: kb-resource-constraint-general
-    template: |
+  - template: |
       cpu: "{{ or .cpu 1 }}"
       memory: "{{ or .memory 4 }}Gi"
     vars: [cpu, memory]
@@ -11,8 +10,7 @@
         cpu: 4
         memory: 16Gi
 
-  - resourceConstraintRef: kb-resource-constraint-memory-optimized
-    template: |
+  - template: |
       cpu: "{{ or .cpu 1 }}"
       memory: "{{ or .memory 4 }}Gi"
     vars: [cpu, memory]

diff --git a/test/e2e/testdata/smoketest/wesql/02_custom_class.yaml b/test/e2e/testdata/smoketest/wesql/02_custom_class.yaml
@@ -8,8 +8,7 @@ metadata:
     clusterdefinition.kubeblocks.io/name: apecloud-mysql
 spec:
   groups:
-    - resourceConstraintRef: kb-resource-constraint-custom
-      template: |
+    - template: |
         cpu: "{{ or .cpu 1 }}" 
         memory: "{{ or .memory 4 }}Gi"
       vars: [ cpu, memory]