Fixed golangci-lint issues: /fission/pkg/executor (#1842)
This commit is contained in:
@@ -54,6 +54,7 @@ func MergeContainer(dst *apiv1.Container, src *apiv1.Container) (*apiv1.Containe
|
||||
return &dstC, errs.ErrorOrNil()
|
||||
}
|
||||
|
||||
// MergePodSpec updates srcPodSpec with targetPodSpec fields if not empty
|
||||
func MergePodSpec(srcPodSpec *apiv1.PodSpec, targetPodSpec *apiv1.PodSpec) (*apiv1.PodSpec, error) {
|
||||
if targetPodSpec == nil {
|
||||
return srcPodSpec, nil
|
||||
|
||||
@@ -37,6 +37,7 @@ func ApplyImagePullSecret(secret string, podspec apiv1.PodSpec) *apiv1.PodSpec {
|
||||
return &podspec
|
||||
}
|
||||
|
||||
// WaitTimeout starts a wait group with timeout
|
||||
func WaitTimeout(wg *sync.WaitGroup, timeout time.Duration) {
|
||||
waitCh := make(chan struct{})
|
||||
go func() {
|
||||
|
||||
Reference in New Issue
Block a user