github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #110134 from mk46/crictl_env_parse

Browse Source 
kubeadm: Parse ENV vars to crictl command
This commit is contained in:
Kubernetes Prow Robot 2022-05-19 14:04:05 -07:00 committed by GitHub
commit e34f51e9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/app/util/runtime/runtime.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package runtime package runtime
import ( import (
"os"
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -68,7 +69,9 @@ func (runtime *CRIRuntime) Socket() string {
// crictl creates a crictl command for the provided args. // crictl creates a crictl command for the provided args.
func (runtime *CRIRuntime) crictl(args ...string) utilsexec.Cmd { func (runtime *CRIRuntime) crictl(args ...string) utilsexec.Cmd {
return runtime.exec.Command(runtime.crictlPath, append([]string{"-r", runtime.Socket()}, args...)...) cmd := runtime.exec.Command(runtime.crictlPath, append([]string{"-r", runtime.Socket()}, args...)...)
cmd.SetEnv(os.Environ())
return cmd
} }
// IsRunning checks if runtime is running // IsRunning checks if runtime is running