From 49a352c6540ff77a2dd2c704d6a613be60ea52e0 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期三, 24 五月 2023 18:10:48 +0800
Subject: [PATCH] 重构项目，导出函数手写字母大写
---
src/main/main.go | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/main.go b/src/main/main.go
index c788412..a04a495 100644
--- a/src/main/main.go
+++ b/src/main/main.go
@@ -8,11 +8,11 @@
"path/filepath"
"time"
+ "../util"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
- "basic.com/aps/aps_deploy.git/src/create"
- "basic.com/aps/aps_deploy.git/src/delete"
+ "../k8s"
)
var (
@@ -53,7 +53,7 @@
}
// 閰嶇疆 Kubernetes 闆嗙兢鐨� kubeconfig 璺緞
- kubeconfig := flag.String("kubeconfig", filepath.Join(homeDir(), ".kube", "config"), "kubeconfig file")
+ kubeconfig := flag.String("kubeconfig", filepath.Join(util.HomeDir(), ".kube", "config"), "kubeconfig file")
flag.Parse()
// 鍒涘缓 Kubernetes 瀹㈡埛绔�
@@ -75,12 +75,12 @@
os.Exit(1)
}
- err := create.CreateDeploymentAndService(clientset, *createNamespace, *createDeployment, *createService)
+ err := k8s.CreateDeploymentAndService(clientset, *createNamespace, *createDeployment, *createService)
if err != nil {
panic(err)
}
- nodeport, err := create.GetServiceNodePort(clientset, *createNamespace, *createService)
+ nodeport, err := k8s.GetServiceNodePort(clientset, *createNamespace, *createService)
if err != nil {
panic(err)
}
@@ -96,7 +96,7 @@
os.Exit(1)
}
- err := delete.DeleteResources(clientset, *deleteNamespace, *deleteDeployment, *deleteService)
+ err := k8s.DeleteResources(clientset, *deleteNamespace, *deleteDeployment, *deleteService)
if err != nil {
panic(err)
}
@@ -113,7 +113,7 @@
for _, ns := range namespaces {
deploymentName := ns
serviceName := ns
- err := create.CreateDeploymentAndService(clientset, ns, deploymentName, serviceName)
+ err := k8s.CreateDeploymentAndService(clientset, ns, deploymentName, serviceName)
if err != nil {
log.Printf("\033[97;41mFailed to create resources in namespace %s: %v\033[0m\n", ns, err)
} else {
@@ -135,7 +135,7 @@
// 鍒犻櫎澶氫釜 Namespace 涓嬬殑鐩稿悓鍚嶇О鐨� Deployment 鍜� Service
for _, ns := range namespaces {
- err = delete.DeleteResources(clientset, ns, ns, ns)
+ err = k8s.DeleteResources(clientset, ns, ns, ns)
if err != nil {
panic(err)
}
@@ -145,11 +145,3 @@
}
}
-// homeDir 鑾峰彇褰撳墠鐢ㄦ埛鐨勫鐩綍璺緞
-func homeDir() string {
- if h := os.Getenv("HOME"); h != "" {
- return h
- }
- return os.Getenv("USERPROFILE") // Windows 鐜涓嬭幏鍙栫敤鎴风洰褰�
-}
-
--
Gitblit v1.8.0