Skip to content

Commit

Permalink
Merge pull request #1505 from torredil/fix-ci
Browse files Browse the repository at this point in the history
Fix CI; Upgrade golangci-lint
  • Loading branch information
k8s-ci-robot authored Feb 8, 2023
2 parents 6d38a50 + 190d2c5 commit b4f67bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ bin/mockgen: | bin

bin/golangci-lint: | bin
echo "Installing golangci-lint..."
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.50.1
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.51.1

.PHONY: kubeval
kubeval: bin/kubeval
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func newEC2Cloud(region string, awsSdkDebugLog bool) (Cloud, error) {
endpoint := os.Getenv("AWS_EC2_ENDPOINT")
if endpoint != "" {
customResolver := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
if service == endpoints.Ec2ServiceID {
if service == ec2.EndpointsID {
return endpoints.ResolvedEndpoint{
URL: endpoint,
SigningRegion: region,
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
const kubeconfigEnvVar = "KUBECONFIG"

func init() {
rand.Seed(time.Now().UTC().UnixNano())
rand.New(rand.NewSource(time.Now().UnixNano()))
testing.Init()
// k8s.io/kubernetes/test/e2e/framework requires env KUBECONFIG to be set
// it does not fall back to defaults
Expand Down

0 comments on commit b4f67bd

Please sign in to comment.