Skip to content

Commit

Permalink
Merge dbedc2f into 36a2784
Browse files Browse the repository at this point in the history
  • Loading branch information
uthark authored Dec 18, 2020
2 parents 36a2784 + dbedc2f commit 94e9fc0
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 59 deletions.
4 changes: 2 additions & 2 deletions controllers/rollingupgrade_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ func TestTerminateNodeErrorScalingActivityInProgress(t *testing.T) {
ScriptRunner: NewScriptRunner(log2.NullLogger{}),
}
err := rcRollingUpgrade.TerminateNode(ruObj, mockNode, "")
g.Expect(err.Error()).To(gomega.ContainSubstring("No more retries left"))
g.Expect(err.Error()).To(gomega.ContainSubstring("no more retries left"))
}

func TestTerminateNodeErrorResourceContention(t *testing.T) {
Expand All @@ -570,7 +570,7 @@ func TestTerminateNodeErrorResourceContention(t *testing.T) {
}

err := rcRollingUpgrade.TerminateNode(ruObj, mockNode, "")
g.Expect(err.Error()).To(gomega.ContainSubstring("No more retries left"))
g.Expect(err.Error()).To(gomega.ContainSubstring("no more retries left"))
}

func TestTerminateNodeErrorOtherError(t *testing.T) {
Expand Down
27 changes: 12 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,23 @@ module github.com/keikoproj/upgrade-manager
go 1.15

require (
github.com/aws/aws-sdk-go v1.33.8
github.com/aws/aws-sdk-go v1.36.11
github.com/cucumber/godog v0.10.0
github.com/go-logr/logr v0.1.0
github.com/keikoproj/aws-sdk-go-cache v0.0.0-20200124200058-ab3c8c94044a
github.com/keikoproj/inverse-exp-backoff v0.0.0-20191216014651-04523236b6ca
github.com/keikoproj/aws-sdk-go-cache v0.0.0-20201118182730-f6f418a4e2df
github.com/keikoproj/inverse-exp-backoff v0.0.0-20201007213207-e4a3ac0f74ab
github.com/keikoproj/kubedog v0.0.1
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.1
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.4
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.6.0
go.uber.org/zap v1.10.0
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
golang.org/x/net v0.0.0-20200202094626-16171245cfb2
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 // indirect
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.17.2
k8s.io/apiextensions-apiserver v0.17.0 // indirect
k8s.io/apimachinery v0.17.2
k8s.io/client-go v0.17.2
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20201216054612-986b41b23924
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.17.15
k8s.io/apiextensions-apiserver v0.17.15 // indirect
k8s.io/apimachinery v0.17.15
k8s.io/client-go v0.17.15
k8s.io/utils v0.0.0-20191218082557-f07c713de883 // indirect
sigs.k8s.io/controller-runtime v0.4.0
)
Loading

0 comments on commit 94e9fc0

Please sign in to comment.