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

optimize code

Browse Source
This commit is contained in:
wencaiwulue
2021-08-07 21:57:59 +08:00
parent 80bf081154
commit fac3117574
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
remote/dhcp.go
View File

@@ -41,14 +41,14 @@ func AddCleanUpResourceHandler(client *kubernetes.Clientset, namespace string, s
for _, s := range strings.Split(services, ",") { for _, s := range strings.Split(services, ",") {
util.ScaleDeploymentReplicasTo(client, namespace, s, 1) util.ScaleDeploymentReplicasTo(client, namespace, s, 1)
newName := s + "-" + "shadow" newName := s + "-" + "shadow"
deletePod(client, newName, namespace) deletePod(client, namespace, newName)
} }
log.Info("clean up successful") log.Info("clean up successful")
os.Exit(0) os.Exit(0)
}() }()
} }
func deletePod(client *kubernetes.Clientset, podName, namespace string) { func deletePod(client *kubernetes.Clientset, namespace, podName string) {
zero := int64(0) zero := int64(0)
err := client.CoreV1().Pods(namespace).Delete(context.TODO(), podName, metav1.DeleteOptions{ err := client.CoreV1().Pods(namespace).Delete(context.TODO(), podName, metav1.DeleteOptions{
GracePeriodSeconds: &zero, GracePeriodSeconds: &zero,
@@ -59,12 +59,12 @@ func deletePod(client *kubernetes.Clientset, podName, namespace string) {
} }
// vendor/k8s.io/kubectl/pkg/polymorphichelpers/rollback.go:99 // vendor/k8s.io/kubectl/pkg/polymorphichelpers/rollback.go:99
func updateRefCount(client *kubernetes.Clientset, namespace string, increment int) { func updateRefCount(client *kubernetes.Clientset, namespace, name string, increment int) {
err := retry.OnError( err := retry.OnError(
retry.DefaultRetry, retry.DefaultRetry,
func(err error) bool { return err != nil }, func(err error) bool { return err != nil },
func() error { func() error {
configMap, err := client.CoreV1().ConfigMaps(namespace).Get(context.TODO(), util.TrafficManager, metav1.GetOptions{}) configMap, err := client.CoreV1().ConfigMaps(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil { if err != nil {
log.Errorf("update ref-count failed, increment: %d, error: %v", increment, err) log.Errorf("update ref-count failed, increment: %d, error: %v", increment, err)
return err return err
@@ -94,7 +94,7 @@ func updateRefCount(client *kubernetes.Clientset, namespace string, increment in
} }
func cleanUpTrafficManagerIfRefCountIsZero(client *kubernetes.Clientset, namespace string) { func cleanUpTrafficManagerIfRefCountIsZero(client *kubernetes.Clientset, namespace string) {
updateRefCount(client, namespace, -1) updateRefCount(client, namespace, util.TrafficManager, -1)
configMap, err := client.CoreV1().ConfigMaps(namespace).Get(context.TODO(), util.TrafficManager, metav1.GetOptions{}) configMap, err := client.CoreV1().ConfigMaps(namespace).Get(context.TODO(), util.TrafficManager, metav1.GetOptions{})
if err != nil { if err != nil {
log.Error(err) log.Error(err)

2
remote/remote.go
View File

@@ -219,6 +219,6 @@ func getLabels(clientset *kubernetes.Clientset, namespace, service string) map[s
return nil return nil
} }
newName := service + "-" + "shadow" newName := service + "-" + "shadow"
deletePod(clientset, newName, namespace) deletePod(clientset, namespace, newName)
return selector return selector
} }