Skip to content

Commit

Permalink
Merge pull request #8835 from medyagh/lint_update
Browse files Browse the repository at this point in the history
ci: update golang lint version
  • Loading branch information
medyagh authored Jul 24, 2020
2 parents 1395c80 + 47ed4bc commit cdfe6ef
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download

KERNEL_VERSION ?= 4.19.107
# 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
GOLINT_JOBS ?= 4
# see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
Expand Down
4 changes: 2 additions & 2 deletions hack/preload-images/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ func createImageTarball(tarballFilename, containerRuntime string) error {
}

if containerRuntime == "containerd" {
dirs = append(dirs, fmt.Sprintf("./lib/containerd"))
dirs = append(dirs, "./lib/containerd")
}

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}
Expand Down
6 changes: 3 additions & 3 deletions pkg/drivers/hyperkit/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ func (d *Driver) Stop() error {
d.cleanupNfsExports()
err := d.sendSignal(syscall.SIGTERM)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("hyperkit sigterm failed"))
return errors.Wrap(err, "hyperkit sigterm failed")
}

// wait 5s for graceful shutdown
Expand All @@ -406,7 +406,7 @@ func (d *Driver) Stop() error {
time.Sleep(time.Second * 1)
s, err := d.GetState()
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 {
return nil
Expand Down Expand Up @@ -468,7 +468,7 @@ func (d *Driver) setupNFSShare() error {
return err
}

mountCommands := fmt.Sprintf("#/bin/bash\\n")
mountCommands := "#/bin/bash\\n"
log.Info(d.IPAddress)

for _, share := range d.NFSShares {
Expand Down
3 changes: 1 addition & 2 deletions pkg/minikube/bootstrapper/bsutil/ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
package bsutil

import (
"fmt"
"os/exec"
"strings"

Expand All @@ -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.
// 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 {
return errors.Wrap(err, fmt.Sprintf("oom_adj adjust"))
return errors.Wrap(err, "oom_adj adjust")
}
return nil
}
Expand Down
1 change: 1 addition & 0 deletions test/stress/stress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#
# Stress test for start, restart, upgrade.
#
Expand Down

0 comments on commit cdfe6ef

Please sign in to comment.