From 94e73826a2c21e968804706b1955aea239220a1a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 05 六月 2023 16:38:19 +0800
Subject: [PATCH] fix
---
src/k8s/create.go | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/src/k8s/create.go b/src/k8s/create.go
index 4865777..65208e4 100644
--- a/src/k8s/create.go
+++ b/src/k8s/create.go
@@ -7,6 +7,7 @@
"log"
"math/rand"
"path/filepath"
+ "strconv"
"basic.com/aps/aps_deploy.git/src/util"
appsv1 "k8s.io/api/apps/v1"
@@ -21,11 +22,12 @@
var (
replicas int32 = 3
port int32 = 9081
+ rpcPort int32 = 9082
namespaces = []string{"guangsheng", "geruimi", "tongsheng"}
usedNodePorts = make(map[int32]bool)
)
-func main() {
+func create_test() {
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
flag.Parse()
@@ -133,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 {
@@ -201,11 +204,31 @@
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",
Value: namespace,
+ },
+ {
+ Name: "DB_HOST",
+ Value: "localhost",
+ },
+ {
+ Name: "DB_NAME",
+ Value: namespace,
+ },
+ {
+ Name: "DB_PORT",
+ Value: strconv.Itoa(3306),
+ },
+ {
+ Name: "DB_USER",
+ Value: namespace,
+ },
+ {
+ Name: "DB_PASSWD",
+ Value: namespace + "@Basic2023",
},
},
},
@@ -232,10 +255,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{
@@ -250,22 +273,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
@@ -336,7 +367,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