diff --git a/README.md b/README.md index 7cb9e20d..da7b41b3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ -# RollingUpgrades +# RollingUpgrade > Reliable, extensible rolling-upgrades of Autoscaling groups in Kubernetes +[![Build Status](https://keikoproj-upgrade-manager.semaphoreci.com/badges/upgrade-manager.svg)](https://keikoproj-upgrade-manager.semaphoreci.com/projects/upgrade-manager) + RollingUpgrade provides a Kubernetes native mechanism for doing rolling-updates of instances in an AutoScaling group using a CRD and a controller. ## What does it do? diff --git a/controllers/rollingupgrade_controller.go b/controllers/rollingupgrade_controller.go index 73620ceb..f443a4c9 100644 --- a/controllers/rollingupgrade_controller.go +++ b/controllers/rollingupgrade_controller.go @@ -397,7 +397,7 @@ func (r *RollingUpgradeReconciler) runRestack(ctx *context.Context, ruObj *upgra value, ok := r.ruObjNameToASG.Load(ruObj.Name) if !ok { - msg := "Failed to find rollup name in map." + msg := "Failed to find rollingUpgrade name in map." log.Printf(msg) return 0, errors.New(msg) } diff --git a/controllers/rollingupgrade_controller_test.go b/controllers/rollingupgrade_controller_test.go index 275efae4..bcb84f6c 100644 --- a/controllers/rollingupgrade_controller_test.go +++ b/controllers/rollingupgrade_controller_test.go @@ -842,7 +842,7 @@ func TestRunRestackRollingUpgradeNotInMap(t *testing.T) { int, err := rcRollingUpgrade.runRestack(&ctx, ruObj, mockAutoscalingGroup, KubeCtlBinary) g.Expect(int).To(gomega.Equal(0)) g.Expect(err).To(gomega.Not(gomega.BeNil())) - g.Expect(err.Error()).To(gomega.HavePrefix("Failed to find rollup name in map.")) + g.Expect(err.Error()).To(gomega.HavePrefix("Failed to find rollingUpgrade name in map.")) } func TestRunRestackRollingUpgradeNodeNameNotFound(t *testing.T) { diff --git a/controllers/rollup_cluster_state_test.go b/controllers/rollup_cluster_state_test.go index 60bee4d7..8c51c013 100644 --- a/controllers/rollup_cluster_state_test.go +++ b/controllers/rollup_cluster_state_test.go @@ -17,9 +17,10 @@ limitations under the License. package controllers import ( + "testing" + "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/onsi/gomega" - "testing" ) var clusterState = NewClusterState() diff --git a/pkg/log/go.mod b/pkg/log/go.mod index 8b056295..8646d978 100644 --- a/pkg/log/go.mod +++ b/pkg/log/go.mod @@ -5,4 +5,5 @@ go 1.13 require ( github.com/aws/aws-sdk-go v1.25.0 github.com/sirupsen/logrus v1.4.2 + golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect ) diff --git a/pkg/log/go.sum b/pkg/log/go.sum index f3062b58..74393f08 100644 --- a/pkg/log/go.sum +++ b/pkg/log/go.sum @@ -1,14 +1,23 @@ -github.com/aws/aws-sdk-go v1.25.42 h1:TTsk8HoF5sIq/i5jTjHmY2t3g+b6EiAyiolw7p50UBY= -github.com/aws/aws-sdk-go v1.25.42/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go v1.25.0 h1:MyXUdCesJLBvSSKYcaKeeEwxNUwUpG6/uqVYeH/Zzfo= +github.com/aws/aws-sdk-go v1.25.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=