mirror of
https://github.com/kubenetworks/kubevpn.git
synced 2025-12-24 11:51:13 +08:00
refactor: fix log
This commit is contained in:
@@ -814,6 +814,13 @@ func (u *sshUt) kubevpnUninstall(ns string) func(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd = exec.Command("kubectl", "delete", "ns", ns, "--wait")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
err = cmd.Run()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
return func(t *testing.T) {
|
||||
|
||||
@@ -851,6 +851,13 @@ func (u *ut) kubevpnUninstall(ns string) func(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cmd = exec.Command("kubectl", "delete", "ns", ns, "--wait")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
err = cmd.Run()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
return func(t *testing.T) {
|
||||
|
||||
@@ -12,16 +12,18 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
"github.com/wencaiwulue/kubevpn/v2/pkg/util"
|
||||
)
|
||||
|
||||
func (u *sshUt) deleteDeployForSaveResource(t *testing.T) {
|
||||
for _, s := range []string{"deploy/productpage", "deploy/ratings"} {
|
||||
cmd := exec.Command("kubectl", "delete", s, "--force")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
|
||||
for _, s := range []string{"productpage", "ratings"} {
|
||||
err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
|
||||
if err != nil && !errors.IsNotFound(err) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,16 +12,18 @@ import (
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
"github.com/wencaiwulue/kubevpn/v2/pkg/util"
|
||||
)
|
||||
|
||||
func (u *ut) deleteDeployForSaveResource(t *testing.T) {
|
||||
for _, s := range []string{"deploy/productpage", "deploy/ratings"} {
|
||||
cmd := exec.Command("kubectl", "delete", s, "--force")
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
err := cmd.Run()
|
||||
if err != nil {
|
||||
options := metav1.DeleteOptions{GracePeriodSeconds: ptr.To[int64](0)}
|
||||
for _, s := range []string{"productpage", "ratings"} {
|
||||
err := u.clientset.AppsV1().Deployments(u.namespace).Delete(context.Background(), s, options)
|
||||
if err != nil && !errors.IsNotFound(err) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user