From f5c295e3f0bb19c1758c352fbc75ce15ed6fb96f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 05 六月 2023 16:38:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/aps_deploy
---
src/k8s/create.go | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 12b995c..c253e0d 100644
--- a/src/k8s/create.go
+++ b/src/k8s/create.go
@@ -22,6 +22,7 @@
var (
replicas int32 = 3
port int32 = 9081
+ rpcPort int32 = 9082
namespaces = []string{"guangsheng", "geruimi", "tongsheng"}
usedNodePorts = make(map[int32]bool)
)
@@ -134,6 +135,7 @@
return err
}
+ log.Printf("Waiting for Deployment %s to be ready...\n", deploymentName)
// 鍒涘缓 Service
err = createService(clientset, namespace, serviceName)
if err != nil {
@@ -197,12 +199,13 @@
"cid": namespace,
},
},
+ ImagePullPolicy: apiv1.PullAlways, // 璁剧疆闀滃儚鎷夊彇绛栫暐涓� Always
},
},
Containers: []apiv1.Container{
{
Name: namespace,
- Image: "192.168.20.119/apsserver/apsserver:v0.2",
+ Image: "192.168.20.119/apsserver/apsserver:v0.5",
Env: []apiv1.EnvVar{
{
Name: "NODE_ID",
@@ -210,7 +213,7 @@
},
{
Name: "DB_HOST",
- Value: namespace,
+ Value: "localhost",
},
{
Name: "DB_NAME",
@@ -253,10 +256,10 @@
func createService(clientset *kubernetes.Clientset, namespace, serviceName string) error {
fmt.Println("\033[1;37;40mCreating Service:", serviceName, "\033[0m")
- nodePort, err := getRandomNodePort(clientset)
- if err != nil {
- return err
- }
+ //nodePort, err := getRandomNodePort(clientset)
+ //if err != nil {
+ // return err
+ //}
service := &apiv1.Service{
ObjectMeta: metav1.ObjectMeta{
@@ -271,22 +274,30 @@
{
Name: "http",
Protocol: apiv1.ProtocolTCP,
- Port: port,
- TargetPort: intstr.FromInt(int(port)),
- NodePort: nodePort,
+ Port: port, // 闆嗙兢鍐呴儴璁块棶绔彛
+ TargetPort: intstr.FromInt(int(port)), // 瀹瑰櫒瀵瑰绔彛
+ NodePort: 0, // 澶栭儴璁块棶绔彛
+ },
+ {
+ Name: "tcp",
+ Protocol: apiv1.ProtocolTCP,
+ Port: rpcPort,
+ TargetPort: intstr.FromInt(int(rpcPort)),
+ NodePort: 0,
},
},
},
}
- _, err = clientset.CoreV1().Services(namespace).Create(context.TODO(), service, metav1.CreateOptions{})
+ _, err := clientset.CoreV1().Services(namespace).Create(context.TODO(), service, metav1.CreateOptions{})
+
if err != nil {
if !errors.IsAlreadyExists(err) {
return fmt.Errorf("failed to create Service: %v", err)
}
- fmt.Printf("Service %s already exists in Namespace %s\n", serviceName, namespace)
+ log.Printf("Service %s already exists in Namespace %s\n", serviceName, namespace)
} else {
- fmt.Printf("Service %s created in Namespace %s\n", serviceName, namespace)
+ log.Printf("Service %s created in Namespace %s\n", serviceName, namespace)
}
return nil
@@ -357,7 +368,12 @@
// 鑾峰彇绗竴涓鍙ｇ殑 NodePort
if len(svc.Spec.Ports) > 0 {
- return svc.Spec.Ports[0].NodePort, nil
+ for _, p := range svc.Spec.Ports {
+ // return tcp port
+ if p.Name == "tcp" {
+ return p.NodePort, nil
+ }
+ }
}
return 0, fmt.Errorf("no ports defined for Service %s", serviceName)
--
Gitblit v1.8.0