Merge branch 'master' into dependabot/go_modules/github.com/prometheu…

…s/client_golang-1.18.0
keikoproj · Feb 3, 2024 · da1c7ee · da1c7ee
2 parents 85eb6ac + 4f03522
commit da1c7ee
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 7 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## v0.6.3
+
+* Bump github.com/spf13/cobra from 1.7.0 to 1.8.0 by @dependabot in #172
+* Bump github.com/aws/aws-sdk-go from 1.47.11 to 1.48.11 by @dependabot in #174
+* Bump github.com/keikoproj/inverse-exp-backoff from 0.0.3 to 0.0.4 by @dependabot in #175
+* Bump k8s.io/api from 0.25.15 to 0.25.16 by @dependabot in #173
+* Increase qps and burst to 100 by @ZihanJiang96 in #184
+
 ## v0.6.2
 
 **NOTE:** Beginning with this release, the docker image tag for `lifecycle-manager` will be prefixed with `v`. For example, `v0.6.2` instead of `0.6.2`. This is to align with the [Semantic Versioning](https://semver.org/) specification.

diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ^1.17
         cache: true
@@ -26,6 +26,6 @@ jobs:
         make test
 
     - name: Upload to Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         file: ./coverage.txt
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://github.com/keikoproj/lifecycle-manager/actions/workflows/unit-test.yaml/badge.svg)](https://github.com/keikoproj/lifecycle-manager/actions/workflows/unit-test.yaml)
 [![codecov](https://codecov.io/gh/keikoproj/lifecycle-manager/branch/master/graph/badge.svg)](https://codecov.io/gh/keikoproj/lifecycle-manager)
 [![Go Report Card](https://goreportcard.com/badge/github.com/keikoproj/lifecycle-manager)](https://goreportcard.com/report/github.com/keikoproj/lifecycle-manager)
-![version](https://img.shields.io/badge/version-0.6.1-green.svg?cacheSeconds=2592000)
+![version](https://img.shields.io/badge/version-0.6.3-green.svg?cacheSeconds=2592000)
 > Graceful AWS scaling event on Kubernetes using lifecycle hooks
 
 lifecycle-manager is a service that can be deployed to a Kubernetes cluster in order to make AWS autoscaling events more graceful using draining
@@ -130,6 +130,7 @@ time="2020-03-11T07:24:49Z" level=info msg="event ce25c321-ec67-3f0b-c156-a7c1f7
 | drain-timeout | 300 | Int | hard time limit for draining healthy nodes |
 | drain-timeout-unknown | 30 | Int | hard time limit for draining nodes that are in unknown state |
 | drain-interval | 30 | Int | interval in seconds for which to retry draining |
+| drain-retries | 3 | Int | number of times to retry the node drain operation |
 | polling-interval | 10 | Int | interval in seconds for which to poll SQS |
 | with-deregister | true | Bool | try to deregister deleting instance from target groups |
 | refresh-expired-credentials | false | Bool | refreshes expired credentials (requires shared credentials file) |

diff --git a/cmd/common.go b/cmd/common.go
@@ -41,6 +41,8 @@ func newKubernetesClient(localMode string) *kubernetes.Clientset {
 		if err != nil {
 			log.Fatalln("cannot load kubernetes config from InCluster")
 		}
+		config.QPS = 100
+		config.Burst = 100
 	}
 	return kubernetes.NewForConfigOrDie(config)
 }

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	golang.org/x/sync v0.5.0
 	k8s.io/api v0.25.16
 	k8s.io/apimachinery v0.25.16
-	k8s.io/client-go v0.25.15
+	k8s.io/client-go v0.25.16
 	k8s.io/kubectl v0.25.15
 )
 

diff --git a/go.sum b/go.sum
@@ -303,8 +303,8 @@ k8s.io/apimachinery v0.25.16 h1:Mk5h4zbHVZh4ZkgRnciYdLRqOREt2dAGTJesDY0WO7U=
 k8s.io/apimachinery v0.25.16/go.mod h1:34oJjP2pnWhz64k0GETsMvDeAp2A2v+gKa/u3tV/+6k=
 k8s.io/cli-runtime v0.25.15 h1:mGmRUMt6qsOMRie00M68t9L49W9GcGFGbHWGyz6ip2Y=
 k8s.io/cli-runtime v0.25.15/go.mod h1:OQvv5URPtvfjKnhwzknRwqD6nZ4hKyLi+wBYaFWT7rs=
-k8s.io/client-go v0.25.15 h1:glbwbRyVA0GvPfchQjc0w8E21hHTXV5F0TpACM/vwyU=
-k8s.io/client-go v0.25.15/go.mod h1:DgGm/Ek2tiIyImLz0WhEbinHVlemUdNUCpXJwCi6S9M=
+k8s.io/client-go v0.25.16 h1:Lf8gd4vP9hR2sDuSU+9id9Mj23u8X58nESZ5m1JcI24=
+k8s.io/client-go v0.25.16/go.mod h1:6y5hyLavOErqO5LWUzk5rwKpRqmwZsE3oe3RW0cgs9s=
 k8s.io/component-base v0.25.15 h1:kOXXrzt6ImZPYi1lKumt3VPrQzWMTdJcNcvUgh1ruQc=
 k8s.io/component-base v0.25.15/go.mod h1:pmku8Srd/in6lyhXhXWv1hc2R8SFeDlDRchK+NjY2Us=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -9,7 +9,7 @@ import (
 var GitCommit string
 
 // The main version number that is being run at the moment.
-const Version = "0.6.1"
+const Version = "0.6.3"
 
 var BuildDate = ""