From d30fe49188fa7b41135b583fd80d802773ba57ad Mon Sep 17 00:00:00 2001 From: Kasper Kondzielski Date: Mon, 22 Apr 2019 01:17:43 +0200 Subject: [PATCH] =?UTF-8?q?[stable/bitcoin]=20Configure=20deployment=20to?= =?UTF-8?q?=20use=20custom=20terminationGracePeriodSe=E2=80=A6=20(#13091)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Bitcoin] Configure deployment to use custom terminationGracePeriodSeconds Signed-off-by: Kasper Kondzielski * [Bitcoin] Update chart version Signed-off-by: Kasper Kondzielski * [Bitcoin] Reset path version after upgrading minor version Signed-off-by: Kasper Kondzielski --- stable/bitcoind/Chart.yaml | 2 +- stable/bitcoind/README.md | 31 ++++++++++++----------- stable/bitcoind/templates/deployment.yaml | 3 ++- stable/bitcoind/values.yaml | 2 +- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/stable/bitcoind/Chart.yaml b/stable/bitcoind/Chart.yaml index be227e8691..ebfd23c6a7 100644 --- a/stable/bitcoind/Chart.yaml +++ b/stable/bitcoind/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: bitcoind -version: 0.1.6 +version: 0.2.0 appVersion: 0.17.1 description: Bitcoin is an innovative payment network and a new kind of money. keywords: diff --git a/stable/bitcoind/README.md b/stable/bitcoind/README.md index cd68a64027..e7a76c97d9 100644 --- a/stable/bitcoind/README.md +++ b/stable/bitcoind/README.md @@ -40,21 +40,22 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the bitcoind chart and their default values. -Parameter | Description | Default ------------------------ | ---------------------------------- | ---------------------------------------------------------- -`image.repository` | Image source repository name | `arilot/docker-bitcoind` -`image.tag` | `bitcoind` release tag. | `0.17.1` -`image.pullPolicy` | Image pull policy | `IfNotPresent` -`service.rpcPort` | RPC port | `8332` -`service.p2pPort` | P2P port | `8333` -`service.testnetPort` | Testnet port | `18332` -`service.testnetP2pPort` | Testnet p2p ports | `18333` -`service.selector` | Node selector | `tx-broadcast-svc` -`persistence.enabled` | Create a volume to store data | `true` -`persistence.accessMode` | ReadWriteOnce or ReadOnly | `ReadWriteOnce` -`persistence.size` | Size of persistent volume claim | `300Gi` -`resources` | CPU/Memory resource requests/limits| `{}` -`configurationFile` | Config file ConfigMap entry | +Parameter | Description | Default +------------------------------- | ------------------------------------------------- | ---------------------------------------------------------- +`image.repository` | Image source repository name | `arilot/docker-bitcoind` +`image.tag` | `bitcoind` release tag. | `0.17.1` +`image.pullPolicy` | Image pull policy | `IfNotPresent` +`service.rpcPort` | RPC port | `8332` +`service.p2pPort` | P2P port | `8333` +`service.testnetPort` | Testnet port | `18332` +`service.testnetP2pPort` | Testnet p2p ports | `18333` +`service.selector` | Node selector | `tx-broadcast-svc` +`persistence.enabled` | Create a volume to store data | `true` +`persistence.accessMode` | ReadWriteOnce or ReadOnly | `ReadWriteOnce` +`persistence.size` | Size of persistent volume claim | `300Gi` +`resources` | CPU/Memory resource requests/limits | `{}` +`configurationFile` | Config file ConfigMap entry | +`terminationGracePeriodSeconds` | Wait time before forcefully terminating container | `30` For more information about Bitcoin configuration please see [Bitcoin.conf_Configuration_File](https://en.bitcoin.it/wiki/Running_Bitcoin#Bitcoin.conf_Configuration_File). diff --git a/stable/bitcoind/templates/deployment.yaml b/stable/bitcoind/templates/deployment.yaml index b0b2decd31..fa1dd2cdbc 100644 --- a/stable/bitcoind/templates/deployment.yaml +++ b/stable/bitcoind/templates/deployment.yaml @@ -20,6 +20,7 @@ spec: app: {{ template "bitcoind.name" . }} release: {{ .Release.Name }} spec: + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} {{- if .Values.configurationFile }} initContainers: - name: copy-bitcoind-config @@ -68,4 +69,4 @@ spec: claimName: {{ .Values.persistence.existingClaim | default (include "bitcoind.fullname" .) }} {{- else }} emptyDir: {} - {{- end -}} + {{- end -}} \ No newline at end of file diff --git a/stable/bitcoind/values.yaml b/stable/bitcoind/values.yaml index 87b7039b57..b2f1a399ea 100644 --- a/stable/bitcoind/values.yaml +++ b/stable/bitcoind/values.yaml @@ -1,7 +1,7 @@ # Default values for bitcoind. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - +terminationGracePeriodSeconds: 30 image: repository: arilot/docker-bitcoind tag: 0.15.1