Merge pull request #8835 from medyagh/lint_update

ci: update golang lint version
pull/8838/head
Medya Ghazizadeh 2020-07-24 15:26:20 -07:00 committed by GitHub
commit cdfe6ef5ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions

View File

@ -55,7 +55,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
KERNEL_VERSION ?= 4.19.107 KERNEL_VERSION ?= 4.19.107
# latest from https://github.com/golangci/golangci-lint/releases # latest from https://github.com/golangci/golangci-lint/releases
GOLINT_VERSION ?= v1.26.0 GOLINT_VERSION ?= v1.29.0
# Limit number of default jobs, to avoid the CI builds running out of memory # Limit number of default jobs, to avoid the CI builds running out of memory
GOLINT_JOBS ?= 4 GOLINT_JOBS ?= 4
# see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint

View File

@ -173,11 +173,11 @@ func createImageTarball(tarballFilename, containerRuntime string) error {
} }
if containerRuntime == "containerd" { if containerRuntime == "containerd" {
dirs = append(dirs, fmt.Sprintf("./lib/containerd")) dirs = append(dirs, "./lib/containerd")
} }
if containerRuntime == "cri-o" { if containerRuntime == "cri-o" {
dirs = append(dirs, fmt.Sprintf("./lib/containers")) dirs = append(dirs, "./lib/containers")
} }
args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename} args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename}

View File

@ -397,7 +397,7 @@ func (d *Driver) Stop() error {
d.cleanupNfsExports() d.cleanupNfsExports()
err := d.sendSignal(syscall.SIGTERM) err := d.sendSignal(syscall.SIGTERM)
if err != nil { if err != nil {
return errors.Wrap(err, fmt.Sprintf("hyperkit sigterm failed")) return errors.Wrap(err, "hyperkit sigterm failed")
} }
// wait 5s for graceful shutdown // wait 5s for graceful shutdown
@ -406,7 +406,7 @@ func (d *Driver) Stop() error {
time.Sleep(time.Second * 1) time.Sleep(time.Second * 1)
s, err := d.GetState() s, err := d.GetState()
if err != nil { if err != nil {
return errors.Wrap(err, fmt.Sprintf("hyperkit waiting graceful shutdown failed")) return errors.Wrap(err, "hyperkit waiting graceful shutdown failed")
} }
if s == state.Stopped { if s == state.Stopped {
return nil return nil
@ -468,7 +468,7 @@ func (d *Driver) setupNFSShare() error {
return err return err
} }
mountCommands := fmt.Sprintf("#/bin/bash\\n") mountCommands := "#/bin/bash\\n"
log.Info(d.IPAddress) log.Info(d.IPAddress)
for _, share := range d.NFSShares { for _, share := range d.NFSShares {

View File

@ -17,7 +17,6 @@ limitations under the License.
package bsutil package bsutil
import ( import (
"fmt"
"os/exec" "os/exec"
"strings" "strings"
@ -42,7 +41,7 @@ func AdjustResourceLimits(c command.Runner) error {
// Prevent the apiserver from OOM'ing before other pods, as it is our gateway into the cluster. // Prevent the apiserver from OOM'ing before other pods, as it is our gateway into the cluster.
// It'd be preferable to do this via Kubernetes, but kubeadm doesn't have a way to set pod QoS. // It'd be preferable to do this via Kubernetes, but kubeadm doesn't have a way to set pod QoS.
if _, err = c.RunCmd(exec.Command("/bin/bash", "-c", "echo -10 | sudo tee /proc/$(pgrep kube-apiserver)/oom_adj")); err != nil { if _, err = c.RunCmd(exec.Command("/bin/bash", "-c", "echo -10 | sudo tee /proc/$(pgrep kube-apiserver)/oom_adj")); err != nil {
return errors.Wrap(err, fmt.Sprintf("oom_adj adjust")) return errors.Wrap(err, "oom_adj adjust")
} }
return nil return nil
} }

View File

@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# Stress test for start, restart, upgrade. # Stress test for start, restart, upgrade.
# #