Merge branch 'release/0.5.1'

takama · Jan 1, 2018 · cd4b7d1 · cd4b7d1
2 parents c9e746e + 285641e
commit cd4b7d1
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 11 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -39,4 +39,4 @@
 
 [[constraint]]
   name = "github.com/takama/bit"
-  version = "0.2.3"
+  version = "0.3.0"
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ REGISTRY?=docker.io/takama
 CA_DIR?=certs
 
 # Use the 0.0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=0.5.0
+RELEASE?=0.5.1
 GOOS?=linux
 GOARCH?=amd64
 

diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -1,6 +1,6 @@
 name: k8sapp
 description: A Helm charts for Kubernetes application
-version: 0.5.0
+version: 0.5.1
 home: https://my.domain/
 sources:
   - https://github.com/takama/k8sapp

diff --git a/charts/values-dev.yaml b/charts/values-dev.yaml
@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.5.0
+  tag: 0.5.1
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

diff --git a/charts/values-stable.yaml b/charts/values-stable.yaml
@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.5.0
+  tag: 0.5.1
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,7 +1,14 @@
-# Version 0.5.0
+# Version 0.5.1
 
 [Documentation](README.md)
 
+## Changelog since 0.5.0
+
+### Codebase
+
+- Excluded `SIGKILL` signal from list of handled signals ([#43](https://github.com/takama/k8sapp/pull/43), [@rumyantseva](https://github.com/rumyantseva))
+- Updated dependency for BitRoute version 0.3.0 ([#45](https://github.com/takama/k8sapp/pull/45), [@takama](https://github.com/takama))
+
 ## Changelog since 0.4.6
 
 ### Configuration

diff --git a/pkg/system/signal.go b/pkg/system/signal.go
@@ -60,7 +60,7 @@ func NewSignals() *Signals {
 		interrupt: make(chan os.Signal, 1),
 		quit:      make(chan struct{}, 1),
 
-		shutdown:    []os.Signal{syscall.SIGINT, syscall.SIGKILL, syscall.SIGTERM},
+		shutdown:    []os.Signal{syscall.SIGINT, syscall.SIGTERM},
 		reload:      []os.Signal{syscall.SIGHUP},
 		maintenance: []os.Signal{syscall.SIGUSR1},
 	}

diff --git a/pkg/system/signal_test.go b/pkg/system/signal_test.go
@@ -54,7 +54,6 @@ func TestSignals(t *testing.T) {
 	shutdownSignals := signals.Get(Shutdown)
 	verifySignal(t, syscall.SIGTERM, shutdownSignals, Shutdown)
 	verifySignal(t, syscall.SIGINT, shutdownSignals, Shutdown)
-	verifySignal(t, syscall.SIGKILL, shutdownSignals, Shutdown)
 	reloadSignals := signals.Get(Reload)
 	verifySignal(t, syscall.SIGHUP, reloadSignals, Reload)
 	maintenanceSignals := signals.Get(Maintenance)