apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: refactor cmd alias status and disconnect (#233)

Browse Source 
* refactor: refactor cmd alias status and disconnect

---------

Co-authored-by: wencaiwulue <895703375@qq.com>
This commit is contained in:
naison
2024-04-27 18:22:34 +08:00
committed by GitHub
parent 6f6d338656
commit 9df4efb98b
21 changed files with 887 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/util/ns.go
View File

@@ -7,7 +7,7 @@ import (
"reflect"
"unsafe"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -24,12 +24,16 @@ import (
"github.com/wencaiwulue/kubevpn/v2/pkg/config"
)
func GetClusterId(client v12.ConfigMapInterface) (types.UID, error) {
a, err := client.Get(context.Background(), config.ConfigMapPodTrafficManager, metav1.GetOptions{})
func GetClusterID(ctx context.Context, client v12.ConfigMapInterface) (types.UID, error) {
configMap, err := client.Get(ctx, config.ConfigMapPodTrafficManager, metav1.GetOptions{})
if err != nil {
return "", err
}
return a.UID, nil
return configMap.UID, nil
}
func GetClusterIDByCM(cm *v1.ConfigMap) types.UID {
return cm.UID
}
func IsSameCluster(client v12.ConfigMapInterface, namespace string, clientB v12.ConfigMapInterface, namespaceB string) (bool, error) {
@@ -37,16 +41,16 @@ func IsSameCluster(client v12.ConfigMapInterface, namespace string, clientB v12.
return false, nil
}
ctx := context.Background()
a, err := client.Get(ctx, config.ConfigMapPodTrafficManager, metav1.GetOptions{})
clusterIDA, err := GetClusterID(ctx, client)
if err != nil {
return false, err
}
var b *corev1.ConfigMap
b, err = clientB.Get(ctx, config.ConfigMapPodTrafficManager, metav1.GetOptions{})
var clusterIDB types.UID
clusterIDB, err = GetClusterID(ctx, clientB)
if err != nil {
return false, err
}
return a.UID == b.UID, nil
return clusterIDA == clusterIDB, nil
}
func ConvertToKubeConfigBytes(factory cmdutil.Factory) ([]byte, string, error) {