@@ -16,6 +16,7 @@ package up
16
16
17
17
import (
18
18
"fmt"
19
+ "log"
19
20
"os"
20
21
"os/exec"
21
22
"os/signal"
@@ -25,7 +26,6 @@ import (
25
26
"syscall"
26
27
27
28
"github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/cmdutil"
28
- cmdError "github.com/operator-framework/operator-sdk/commands/operator-sdk/error"
29
29
"github.com/operator-framework/operator-sdk/pkg/util/k8sutil"
30
30
31
31
"github.com/spf13/cobra"
@@ -56,18 +56,13 @@ var (
56
56
)
57
57
58
58
const (
59
- gocmd = "go"
60
- run = "run"
61
- cmd = "cmd"
62
- main = "main.go"
63
59
defaultConfigPath = ".kube/config"
64
60
)
65
61
66
62
func upLocalFunc (cmd * cobra.Command , args []string ) {
67
63
mustKubeConfig ()
68
64
cmdutil .MustInProjectRoot ()
69
- c := cmdutil .GetConfig ()
70
- upLocal (c .ProjectName )
65
+ upLocal ()
71
66
}
72
67
73
68
// mustKubeConfig checks if the kubeconfig file exists.
@@ -76,31 +71,31 @@ func mustKubeConfig() {
76
71
if len (kubeConfig ) == 0 {
77
72
usr , err := user .Current ()
78
73
if err != nil {
79
- cmdError . ExitWithError ( cmdError . ExitError , fmt . Errorf ( "failed to determine user's home dir: %v" , err ) )
74
+ log . Fatalf ( "failed to determine user's home dir: %v" , err )
80
75
}
81
76
kubeConfig = filepath .Join (usr .HomeDir , defaultConfigPath )
82
77
}
83
78
84
79
_ , err := os .Stat (kubeConfig )
85
80
if err != nil && os .IsNotExist (err ) {
86
- cmdError . ExitWithError ( cmdError . ExitError , fmt . Errorf ( "failed to find the kubeconfig file (%v): %v" , kubeConfig , err ) )
81
+ log . Fatalf ( "failed to find the kubeconfig file (%v): %v" , kubeConfig , err )
87
82
}
88
83
}
89
84
90
- func upLocal (projectName string ) {
91
- args := []string {run , filepath .Join (cmd , projectName , main )}
85
+ func upLocal () {
86
+ args := []string {" run" , filepath .Join (" cmd" , "manager" , " main.go" )}
92
87
if operatorFlags != "" {
93
88
extraArgs := strings .Split (operatorFlags , " " )
94
89
args = append (args , extraArgs ... )
95
90
}
96
- dc := exec .Command (gocmd , args ... )
91
+ dc := exec .Command ("go" , args ... )
97
92
c := make (chan os.Signal )
98
93
signal .Notify (c , os .Interrupt , syscall .SIGTERM )
99
94
go func () {
100
95
<- c
101
96
err := dc .Process .Kill ()
102
97
if err != nil {
103
- cmdError . ExitWithError ( cmdError . ExitError , fmt . Errorf ( "failed to terminate the operator: %v" , err ) )
98
+ log . Fatalf ( "failed to terminate the operator: %v" , err )
104
99
}
105
100
os .Exit (0 )
106
101
}()
@@ -109,6 +104,6 @@ func upLocal(projectName string) {
109
104
dc .Env = append (os .Environ (), fmt .Sprintf ("%v=%v" , k8sutil .KubeConfigEnvVar , kubeConfig ), fmt .Sprintf ("%v=%v" , k8sutil .WatchNamespaceEnvVar , namespace ))
110
105
err := dc .Run ()
111
106
if err != nil {
112
- cmdError . ExitWithError ( cmdError . ExitError , fmt . Errorf ( "failed to run operator locally: %v" , err ) )
107
+ log . Fatalf ( "failed to run operator locally: %v" , err )
113
108
}
114
109
}
0 commit comments