Simplify

Signed-off-by: Oleg Atamanenko <[email protected]>
keikoproj · Nov 16, 2020 · 68fd8e8 · 68fd8e8
1 parent 8af4f02
commit 68fd8e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Golangci-lint
-      uses: golangci/golangci-lint-action@v1
+      uses: golangci/golangci-lint-action@v2
       with:
         # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
         version: v1.32

diff --git a/controllers/script_runner.go b/controllers/script_runner.go
@@ -60,9 +60,7 @@ func (r *ScriptRunner) drainNode(nodeName string, ruObj *upgrademgrv1alpha1.Roll
 func (r *ScriptRunner) runScriptWithEnv(script string, background bool, ruObj *upgrademgrv1alpha1.RollingUpgrade, env []string) (string, error) {
 	r.info(ruObj, "Running script", "script", script)
 	command := exec.Command(ShellBinary, "-c", script)
-	if env != nil {
-		command.Env = append(os.Environ(), env...)
-	}
+	command.Env = append(os.Environ(), env...)
 
 	if background {
 		r.info(ruObj, "Running script in background. Logs not available.")