Merge pull request #98 from intelligentfu/helm_action

doc an service

README-CN.md

@@ -22,6 +22,7 @@ kubectl apply -f https://raw.githubusercontent.com/selectdb/doris-operator/maste
 ```
 ## 部署 Doris  
 [部署范例](./doc/examples)中提供了一些使用Kubernetes特性部署 Doris 的范例。  
+默认的部署样例中，每个 fe 和 be 最少需要8核和16G的内存，且每个服务部署3个实例。 在使用默认部署之前，确保 K8s 集群有足够的资源能够部署成功。  
 部署使用容器自身存储(重启丢失数据属易失性介质)包含 fe,be 服务的 Doris 集群，命令如下：  
 ```  
 kubectl apply -f https://raw.githubusercontent.com/selectdb/doris-operator/master/doc/examples/doriscluster-sample.yaml  

README.md

@@ -27,7 +27,8 @@ kubectl apply -f https://raw.githubusercontent.com/selectdb/doris-operator/maste
 ```
 
 ## Get Started to Deploy Doris
-The [Quick Start Guide](./doc/examples) have some examples to deploy doris on kubernetes. they represent some mode to deploy doris on different situation.
+The [Quick Start Guide](./doc/examples) have some examples to deploy doris on kubernetes. they represent some mode to deploy doris on different situation.   
+Example specify 8 cores and 16GB of memory for every fe or be, and deployed 3 fe and 3 be. Please confirm the K8s cluster have enough resources.  
 for only deploy fe and be without persistentVolume:
 ```
 kubectl apply -f https://raw.githubusercontent.com/selectdb/doris-operator/master/doc/examples/doriscluster-sample.yaml

docker/be/Dockerfile_be_ubuntu

@@ -55,6 +55,8 @@ COPY resource/entry_point.sh /usr/local/bin/
 
 COPY resource/init_be.sh /usr/local/bin/
 
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
 WORKDIR /opt/apache-doris
 
 ENTRYPOINT ["bash","entry_point.sh"]

docker/fe/Dockerfile_fe_ubuntu

@@ -54,6 +54,9 @@ COPY resource/fe_*.sh /opt/apache-doris/
 
 COPY --from=selectdb/doris-debug-ubuntu:latest /doris-debug /opt/apache-doris/
 
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+
 WORKDIR /opt/apache-doris
 
-ENTRYPOINT ["/opt/apache-doris/fe/bin/init_fe.sh"]
+ENTRYPOINT ["/opt/apache-doris/fe/bin/init_fe.sh"]

pkg/common/utils/k8s/client.go

@@ -36,7 +36,7 @@ func ApplyService(ctx context.Context, k8sclient client.Client, svc *corev1.Serv
 		return nil
 	}
 
-	return PatchClientObject(ctx, k8sclient, svc)
+	return UpdateClientObject(ctx, k8sclient, svc)
 }
 
 // ApplyStatefulSet when the object is not exist, create object. if exist and statefulset have been updated, patch the statefulset.

pkg/common/utils/resource/service.go

@@ -17,7 +17,7 @@ type hashService struct {
 	ports     []corev1.ServicePort
 	selector  map[string]string
 	//deal with external access load balancer.
-	//serviceType corev1.ServiceType
+	serviceType corev1.ServiceType
 	labels      map[string]string
 	annotations map[string]string
 }
@@ -136,6 +136,11 @@ func constructServiceSpec(exportService *v1.ExportService, svc *corev1.Service,
 		Selector: selector,
 		Ports:    ports,
 	}
+
+	if exportService != nil && exportService.Type == corev1.ServiceTypeLoadBalancer {
+		svc.Spec.SessionAffinity = corev1.ServiceAffinityNone
+	}
+
 	setServiceType(exportService, svc)
 }
 
@@ -323,6 +328,7 @@ func serviceHashObject(svc *corev1.Service) hashService {
 		namespace:   svc.Namespace,
 		ports:       svc.Spec.Ports,
 		selector:    svc.Spec.Selector,
+		serviceType: svc.Spec.Type,
 		labels:      svc.Labels,
 		annotations: annos,
 	}