refactor: 将内部包改为公共包

- 将 internal/kubectl 改为 pkg/comm/kubectl - 将 internal/utils改为 pkg/comm/utils - 更新相关文件的导入路径 - 重命名部分文件以适应新路径
weibaohui · Oct 19, 2024 · 7ffd4ba · 7ffd4ba
1 parent 38ee667
commit 7ffd4ba
Show file tree

Hide file tree

Showing 46 changed files with 21 additions and 21 deletions.
diff --git a/main.go b/main.go
@@ -10,8 +10,8 @@ import (
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-gonic/gin"
 	"github.com/weibaohui/k8m/flag"
-	"github.com/weibaohui/k8m/internal/kubectl"
 	"github.com/weibaohui/k8m/pkg/callback"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
 	"github.com/weibaohui/k8m/pkg/controller/chat"
 	"github.com/weibaohui/k8m/pkg/controller/deploy"
 	"github.com/weibaohui/k8m/pkg/controller/doc"

diff --git a/pkg/callback/cb.go b/pkg/callback/cb.go
@@ -3,7 +3,7 @@ package callback
 import (
 	"context"
 
-	"github.com/weibaohui/k8m/internal/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
 	"k8s.io/klog/v2"
 )
 

diff --git a/internal/kubectl/apply.go → pkg/comm/kubectl/apply.go b/internal/kubectl/apply.go → pkg/comm/kubectl/apply.go
diff --git a/internal/kubectl/callback.go → pkg/comm/kubectl/callback.go b/internal/kubectl/callback.go → pkg/comm/kubectl/callback.go
diff --git a/internal/kubectl/client.go → pkg/comm/kubectl/client.go b/internal/kubectl/client.go → pkg/comm/kubectl/client.go
diff --git a/internal/kubectl/configmap.go → pkg/comm/kubectl/configmap.go b/internal/kubectl/configmap.go → pkg/comm/kubectl/configmap.go
diff --git a/internal/kubectl/deploy.go → pkg/comm/kubectl/deploy.go b/internal/kubectl/deploy.go → pkg/comm/kubectl/deploy.go
diff --git a/internal/kubectl/doc.go → pkg/comm/kubectl/doc.go b/internal/kubectl/doc.go → pkg/comm/kubectl/doc.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/weibaohui/k8m/internal/utils"
+	"github.com/weibaohui/k8m/pkg/comm/utils"
 	"k8s.io/klog/v2"
 )
 

diff --git a/internal/kubectl/dynamic.go → pkg/comm/kubectl/dynamic.go b/internal/kubectl/dynamic.go → pkg/comm/kubectl/dynamic.go
diff --git a/internal/kubectl/dynamic_comm.go → pkg/comm/kubectl/dynamic_comm.go b/internal/kubectl/dynamic_comm.go → pkg/comm/kubectl/dynamic_comm.go
diff --git a/internal/kubectl/dynamic_crd.go → pkg/comm/kubectl/dynamic_crd.go b/internal/kubectl/dynamic_crd.go → pkg/comm/kubectl/dynamic_crd.go
diff --git a/internal/kubectl/dynamic_gvr.go → pkg/comm/kubectl/dynamic_gvr.go b/internal/kubectl/dynamic_gvr.go → pkg/comm/kubectl/dynamic_gvr.go
diff --git a/internal/kubectl/image_pull_secret.go → pkg/comm/kubectl/image_pull_secret.go b/internal/kubectl/image_pull_secret.go → pkg/comm/kubectl/image_pull_secret.go
diff --git a/internal/kubectl/ingress.go → pkg/comm/kubectl/ingress.go b/internal/kubectl/ingress.go → pkg/comm/kubectl/ingress.go
diff --git a/internal/kubectl/kubectl.go → pkg/comm/kubectl/kubectl.go b/internal/kubectl/kubectl.go → pkg/comm/kubectl/kubectl.go
diff --git a/internal/kubectl/node.go → pkg/comm/kubectl/node.go b/internal/kubectl/node.go → pkg/comm/kubectl/node.go
diff --git a/internal/kubectl/ns.go → pkg/comm/kubectl/ns.go b/internal/kubectl/ns.go → pkg/comm/kubectl/ns.go
diff --git a/internal/kubectl/pod.go → pkg/comm/kubectl/pod.go b/internal/kubectl/pod.go → pkg/comm/kubectl/pod.go
diff --git a/internal/kubectl/pod_file.go → pkg/comm/kubectl/pod_file.go b/internal/kubectl/pod_file.go → pkg/comm/kubectl/pod_file.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/weibaohui/k8m/internal/utils"
+	"github.com/weibaohui/k8m/pkg/comm/utils"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/klog/v2"
 )

diff --git a/internal/kubectl/pvc.go → pkg/comm/kubectl/pvc.go b/internal/kubectl/pvc.go → pkg/comm/kubectl/pvc.go
diff --git a/internal/kubectl/secret.go → pkg/comm/kubectl/secret.go b/internal/kubectl/secret.go → pkg/comm/kubectl/secret.go
diff --git a/internal/kubectl/service_account.go → pkg/comm/kubectl/service_account.go b/internal/kubectl/service_account.go → pkg/comm/kubectl/service_account.go
diff --git a/internal/kubectl/statement.go → pkg/comm/kubectl/statement.go b/internal/kubectl/statement.go → pkg/comm/kubectl/statement.go
@@ -1,7 +1,7 @@
 package kubectl
 
 import (
-	"github.com/weibaohui/k8m/internal/utils"
+	"github.com/weibaohui/k8m/pkg/comm/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )

diff --git a/internal/kubectl/svc.go → pkg/comm/kubectl/svc.go b/internal/kubectl/svc.go → pkg/comm/kubectl/svc.go
diff --git a/internal/utils/amis/amis_list_result.go → pkg/comm/utils/amis/amis_list_result.go b/internal/utils/amis/amis_list_result.go → pkg/comm/utils/amis/amis_list_result.go
diff --git a/internal/utils/amis/amis_ok_result.go → pkg/comm/utils/amis/amis_ok_result.go b/internal/utils/amis/amis_ok_result.go → pkg/comm/utils/amis/amis_ok_result.go
diff --git a/internal/utils/amis/amis_ui.go → pkg/comm/utils/amis/amis_ui.go b/internal/utils/amis/amis_ui.go → pkg/comm/utils/amis/amis_ui.go
diff --git a/internal/utils/base64.go → pkg/comm/utils/base64.go b/internal/utils/base64.go → pkg/comm/utils/base64.go
diff --git a/internal/utils/git_url_parser.go → pkg/comm/utils/git_url_parser.go b/internal/utils/git_url_parser.go → pkg/comm/utils/git_url_parser.go
diff --git a/internal/utils/git_url_parser_test.go → pkg/comm/utils/git_url_parser_test.go b/internal/utils/git_url_parser_test.go → pkg/comm/utils/git_url_parser_test.go
diff --git a/internal/utils/harbor.go → pkg/comm/utils/harbor.go b/internal/utils/harbor.go → pkg/comm/utils/harbor.go
diff --git a/internal/utils/harbor_test.go → pkg/comm/utils/harbor_test.go b/internal/utils/harbor_test.go → pkg/comm/utils/harbor_test.go
diff --git a/internal/utils/json.go → pkg/comm/utils/json.go b/internal/utils/json.go → pkg/comm/utils/json.go
diff --git a/internal/utils/json_test.go → pkg/comm/utils/json_test.go b/internal/utils/json_test.go → pkg/comm/utils/json_test.go
diff --git a/internal/utils/label.go → pkg/comm/utils/label.go b/internal/utils/label.go → pkg/comm/utils/label.go
diff --git a/internal/utils/ptr.go → pkg/comm/utils/ptr.go b/internal/utils/ptr.go → pkg/comm/utils/ptr.go
diff --git a/internal/utils/random.go → pkg/comm/utils/random.go b/internal/utils/random.go → pkg/comm/utils/random.go
diff --git a/internal/utils/strings.go → pkg/comm/utils/strings.go b/internal/utils/strings.go → pkg/comm/utils/strings.go
diff --git a/pkg/controller/chat/chat.go b/pkg/controller/chat/chat.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sashabaranov/go-openai"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	"github.com/weibaohui/k8m/pkg/service"
 	"k8s.io/klog/v2"
 )

diff --git a/pkg/controller/deploy/deploy.go b/pkg/controller/deploy/deploy.go
@@ -2,8 +2,8 @@ package deploy
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 )
 
 func UpdateImageTag(c *gin.Context) {

diff --git a/pkg/controller/doc/doc.go b/pkg/controller/doc/doc.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	"github.com/weibaohui/k8m/pkg/service"
 )
 

diff --git a/pkg/controller/dynamic/dynamic.go b/pkg/controller/dynamic/dynamic.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/yaml"
 )

diff --git a/pkg/controller/ns/ns.go b/pkg/controller/ns/ns.go
@@ -2,8 +2,8 @@ package ns
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 )
 
 func OptionList(c *gin.Context) {

diff --git a/pkg/controller/pod/pod.go b/pkg/controller/pod/pod.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	"github.com/weibaohui/k8m/pkg/controller/sse"
 )
 

diff --git a/pkg/controller/pod/pod_file.go b/pkg/controller/pod/pod_file.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/kubectl"
-	"github.com/weibaohui/k8m/internal/utils"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/kubectl"
+	"github.com/weibaohui/k8m/pkg/comm/utils"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	"k8s.io/klog/v2"
 )
 

diff --git a/pkg/controller/sse/download.go b/pkg/controller/sse/download.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"github.com/gin-gonic/gin"
-	"github.com/weibaohui/k8m/internal/utils/amis"
+	"github.com/weibaohui/k8m/pkg/comm/utils/amis"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
 )