From f2424384ebf5edfdecc9a171024e0db5f7aaaa8a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 07 六月 2023 15:33:39 +0800
Subject: [PATCH] fix
---
src/k8s/create.go | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 81dfc89..a1681ca 100644
--- a/src/k8s/create.go
+++ b/src/k8s/create.go
@@ -27,6 +27,17 @@
usedNodePorts = make(map[int32]bool)
)
+type Config struct {
+ Client *kubernetes.Clientset // Kubernetes 瀹㈡埛绔�
+ Image string // 闀滃儚鍚嶇О
+ DBHost string // 鏁版嵁搴撳湴鍧�
+ HttpPort int32 // HTTP 绔彛
+ RpcPort int32 // RPC 绔彛
+ NameSpace string // Namespace
+ DeploymentName string // Deployment 鍚嶇О
+ ServiceName string // Service 鍚嶇О
+}
+
func create_test() {
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
@@ -45,7 +56,7 @@
// 鍒涘缓澶氫釜 Namespace 涓嬬殑鐩稿悓鍚嶇О鐨� Deployment 鍜� Service
for _, ns := range namespaces {
- err = CreateDeploymentAndService(clientset, ns, ns, ns)
+ err = CreateDeploymentAndService(Config{Client: clientset, NameSpace: ns, DeploymentName: ns, ServiceName: ns})
if err != nil {
panic(err)
}
@@ -114,37 +125,35 @@
return nil
}
-func CreateDeploymentAndService(clientset *kubernetes.Clientset, namespace, deploymentName, serviceName string) error {
- fmt.Println("\033[1;37;40mCreating resources in Namespace:", namespace, "\033[0m")
+func CreateDeploymentAndService(config Config) error {
+ fmt.Println("\033[1;37;40mCreating resources in Namespace:", config.NameSpace, "\033[0m")
// 妫�娴嬪苟鍒犻櫎宸插瓨鍦ㄧ殑 Deployment 鍜� Service
- err := CheckAndDeleteResources(clientset, namespace, deploymentName, serviceName)
+ err := CheckAndDeleteResources(config.Client, config.NameSpace, config.DeploymentName, config.ServiceName)
if err != nil {
return err
}
// 鍒涘缓 Namespace
- err = createNamespace(clientset, namespace)
+ err = createNamespace(config.Client, config.NameSpace)
if err != nil {
return err
}
- nodePort1, nodePort2, err := getTwoNodePort(clientset)
+ config.HttpPort, config.RpcPort, err = getTwoNodePort(config.Client)
if err != nil {
return err
}
- port1 := fmt.Sprint(nodePort1)
- port2 := fmt.Sprint(nodePort2)
// 鍒涘缓 Deployment
- err = createDeployment(clientset, namespace, deploymentName, port1, port2)
+ err = createDeployment(config)
if err != nil {
return err
}
- log.Printf("Waiting for Deployment %s to be ready...\n", deploymentName)
+ log.Printf("Waiting for Deployment %s to be ready...\n", config.DeploymentName)
// 鍒涘缓 Service
- err = createService(clientset, namespace, serviceName, nodePort1, nodePort2)
+ err = createService(config)
if err != nil {
return err
}
@@ -175,24 +184,24 @@
return nil
}
-func createDeployment(clientset *kubernetes.Clientset, namespace, deploymentName, port1, port2 string) error {
- fmt.Println("\033[1;37;40mCreating Deployment:", deploymentName, "\033[0m")
+func createDeployment(config Config) error {
+ fmt.Println("\033[1;37;40mCreating Deployment:", config.DeploymentName, "\033[0m")
deployment := &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
- Name: deploymentName,
+ Name: config.DeploymentName,
},
Spec: appsv1.DeploymentSpec{
Replicas: &replicas,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
- "cid": namespace,
+ "cid": config.NameSpace,
},
},
Template: apiv1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
- "cid": namespace,
+ "cid": config.NameSpace,
},
},
Spec: apiv1.PodSpec{
@@ -203,21 +212,20 @@
WhenUnsatisfiable: apiv1.DoNotSchedule,
LabelSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
- "cid": namespace,
+ "cid": config.NameSpace,
},
},
},
},
Containers: []apiv1.Container{
{
- Name: namespace,
- Image: "harbor.smartai.com/apsserver/apsserver:v0.2",
+ Name: config.NameSpace,
+ Image: config.Image,
Env: []apiv1.EnvVar{
{
Name: "GRPC_PORT",
- Value: port1,
+ Value: fmt.Sprint(config.RpcPort),
},
- // todo 浠庨厤缃枃浠朵腑璇诲彇
{
Name: "DB_HOST",
Value: "172.20.11.128",
@@ -228,7 +236,7 @@
},
{
Name: "DB_NAME",
- Value: namespace,
+ Value: config.NameSpace,
},
{
Name: "DB_PORT",
@@ -236,11 +244,11 @@
},
{
Name: "DB_USER",
- Value: namespace,
+ Value: config.NameSpace,
},
{
Name: "DB_PASSWD",
- Value: namespace + "@Basic2023",
+ Value: config.NameSpace + "@Basic2023",
},
},
ImagePullPolicy: apiv1.PullAlways, // 璁剧疆闀滃儚鎷夊彇绛栫暐涓� Always
@@ -251,30 +259,30 @@
},
}
- _, err := clientset.AppsV1().Deployments(namespace).Create(context.TODO(), deployment, metav1.CreateOptions{})
+ _, err := config.Client.AppsV1().Deployments(config.DeploymentName).Create(context.TODO(), deployment, metav1.CreateOptions{})
if err != nil {
if !errors.IsAlreadyExists(err) {
return fmt.Errorf("failed to create Deployment: %v", err)
}
- fmt.Printf("Deployment %s already exists in Namespace %s\n", deploymentName, namespace)
+ fmt.Printf("Deployment %s already exists in Namespace %s\n", config.DeploymentName, config.NameSpace)
} else {
- fmt.Printf("Deployment %s created in Namespace %s\n", deploymentName, namespace)
+ fmt.Printf("Deployment %s created in Namespace %s\n", config.DeploymentName, config.NameSpace)
}
return nil
}
// createService 鍒涘缓鎸囧畾鐨� Service
-func createService(clientset *kubernetes.Clientset, namespace, serviceName string, port1, port2 int32) error {
- fmt.Println("\033[1;37;40mCreating Service:", serviceName, "\033[0m")
+func createService(config Config) error {
+ fmt.Println("\033[1;37;40mCreating Service:", config.ServiceName, "\033[0m")
service := &apiv1.Service{
ObjectMeta: metav1.ObjectMeta{
- Name: serviceName,
+ Name: config.ServiceName,
},
Spec: apiv1.ServiceSpec{
Selector: map[string]string{
- "cid": namespace,
+ "cid": config.NameSpace,
},
Type: apiv1.ServiceTypeNodePort,
Ports: []apiv1.ServicePort{
@@ -283,28 +291,29 @@
Protocol: apiv1.ProtocolTCP,
Port: port, // 闆嗙兢鍐呴儴璁块棶绔彛
TargetPort: intstr.FromInt(int(port)), // 瀹瑰櫒瀵瑰绔彛
- NodePort: port1, // 澶栭儴璁块棶绔彛
+ NodePort: config.HttpPort, // 澶栭儴璁块棶绔彛
},
{
Name: "tcp",
Protocol: apiv1.ProtocolTCP,
Port: rpcPort,
TargetPort: intstr.FromInt(int(rpcPort)),
- NodePort: port2,
+ NodePort: config.RpcPort,
},
},
+ SessionAffinity: apiv1.ServiceAffinityClientIP,
},
}
- _, err := clientset.CoreV1().Services(namespace).Create(context.TODO(), service, metav1.CreateOptions{})
+ _, err := config.Client.CoreV1().Services(config.ServiceName).Create(context.TODO(), service, metav1.CreateOptions{})
if err != nil {
if !errors.IsAlreadyExists(err) {
return fmt.Errorf("failed to create Service: %v", err)
}
- log.Printf("Service %s already exists in Namespace %s\n", serviceName, namespace)
+ log.Printf("Service %s already exists in Namespace %s\n", config.ServiceName, config.NameSpace)
} else {
- log.Printf("Service %s created in Namespace %s\n", serviceName, namespace)
+ log.Printf("Service %s created in Namespace %s\n", config.ServiceName, config.NameSpace)
}
return nil
--
Gitblit v1.8.0