fix test error

apecloud · Oct 8, 2022 · 56a21da · 56a21da
1 parent 8e07fb9
commit 56a21da
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/apis/dbaas/v1alpha1/cluster_types.go b/apis/dbaas/v1alpha1/cluster_types.go
@@ -136,8 +136,6 @@ type ClusterComponent struct {
 	// (if supported in the current cloud) which routes to the same endpoints
 	// as the clusterIP.
 	// More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
-	// +kubebuilder:default=ClusterIP
-	// +kubebuilder:validation:Enum={ClusterIP,NodePort,LoadBalancer}
 	// +optional
 	Service corev1.ServiceSpec `json:"service,omitempty"`
 	// ServiceType corev1.ServiceType `json:"serviceType,omitempty"`

diff --git a/config/crd/bases/dbaas.infracreate.com_clusters.yaml b/config/crd/bases/dbaas.infracreate.com_clusters.yaml
@@ -94,7 +94,6 @@ spec:
                           type: object
                       type: object
                     service:
-                      default: ClusterIP
                       description: 'serviceType determines how the Service is exposed.
                         Valid options are ClusterIP, NodePort, and LoadBalancer. "ClusterIP"
                         allocates a cluster-internal IP address for load-balancing
@@ -108,10 +107,6 @@ spec:
                         on NodePort and creates an external load-balancer (if supported
                         in the current cloud) which routes to the same endpoints as
                         the clusterIP. More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types'
-                      enum:
-                      - ClusterIP
-                      - NodePort
-                      - LoadBalancer
                       properties:
                         allocateLoadBalancerNodePorts:
                           description: allocateLoadBalancerNodePorts defines if NodePorts

diff --git a/controllers/dbaas/config_template_test.go b/controllers/dbaas/config_template_test.go
@@ -64,7 +64,7 @@ loose_binlog_checksum           = crc32
 cluster_name = {{ .Cluster.Name }}
 cluster_namespace = {{ .Cluster.Namespace }}
 component_name = {{ .Component.Name }}
-component_replica = {{ .RoleGroup.Replicas }}
+component_replica = {{ .Component.Replicas }}
 
 {{- $test_value := callBufferSizeByResource ( index .PodSpec.Containers 0 ) }}
 {{ if $test_value -}}
@@ -178,6 +178,7 @@ loose_innodb_primary_flush_max_lsn_lag =  780903144
 			ClusterType:    "state.mysql-8",
 			Name:           "replicasets",
 			Type:           "replicasets",
+			Replicas:       5,
 		}
 		cfgTemplate = []dbaasv1alpha1.ConfigTemplate{
 			{

diff --git a/deploy/helm/crds/dbaas.infracreate.com_clusters.yaml b/deploy/helm/crds/dbaas.infracreate.com_clusters.yaml
@@ -94,7 +94,6 @@ spec:
                           type: object
                       type: object
                     service:
-                      default: ClusterIP
                       description: 'serviceType determines how the Service is exposed.
                         Valid options are ClusterIP, NodePort, and LoadBalancer. "ClusterIP"
                         allocates a cluster-internal IP address for load-balancing
@@ -108,10 +107,6 @@ spec:
                         on NodePort and creates an external load-balancer (if supported
                         in the current cloud) which routes to the same endpoints as
                         the clusterIP. More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types'
-                      enum:
-                      - ClusterIP
-                      - NodePort
-                      - LoadBalancer
                       properties:
                         allocateLoadBalancerNodePorts:
                           description: allocateLoadBalancerNodePorts defines if NodePorts