From 8fef2d61c9e83390076c90616e8988057bf00547 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 14:26:35 +0100 Subject: [PATCH 1/8] Add README for bee --- charts/bee/README.md | 104 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 charts/bee/README.md diff --git a/charts/bee/README.md b/charts/bee/README.md new file mode 100644 index 0000000..1b67a9f --- /dev/null +++ b/charts/bee/README.md @@ -0,0 +1,104 @@ +# Bee Helm Chart + +[Ethereum Swarm Bee](https://github.com/ethersphere/bee) is an experiment to abstract libp2p as underlay networking for Ethereum Swarm. + +## QuickStart + +```bash +$ helm install --generate-name ethersphere/bee +``` + +## Introduction + +This chart deploys a [Ethereum Swarm Bee](https://github.com/ethersphere/bee) onto a Kubernetes cluster using the Helm package manager. It creates ConfigMap, Deployment and Service Kubernetes objects, while Ingress and ServiceAccount are optional. + +## Prerequisites + +* Kubernetes 1.15 +* Helm 3.0 + +## Installing the Chart + +To install the chart with the release name `my-release`: + +```bash +$ helm install --name my-release ethersphere/bee +``` + +The command deploys Bee on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. + +## Uninstalling the Chart + +To uninstall/delete the `my-release` deployment: + +```bash +$ helm delete my-release +``` + +The command removes all the Kubernetes components associated with the chart and deletes the release. + +## Configuration + +The default configuration values for this chart are listed in **values.yaml**. + +Bee specific configuration parameters can be configured in **beeConfig** section. + +Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, + +```bash +$ helm install --name my-release \ + --set serviceAccount.create=true \ + ethersphere/bee +``` + +The above command creates ServiceAccount for the deployment. + +Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, + +```bash +$ helm install --name my-release -f values.yaml ethersphere/bee +``` + +## Helmsman Usage + +### Prerequisites + +* Kubernetes 1.15 +* Helm 3.0 +* Helmsman 3.0 + +### Installing + +Create bee.yaml file as shown bellow: + +```yaml +namespaces: + bee: + +helmRepos: + ethersphere: "https://ethersphere.github.io/helm" + +apps: + bee: + name: bee + namespace: bee + description: "Ethereum Swarm Bee" + chart: "ethersphere/bee" + version: "0.1.0" + enabled: true + wait: true + timeout: 120 + +``` + +Execute following command: +```bash +$ helmsman -apply -f bee.yaml +``` + +### Uninstalling + +Execute following command: +```bash +$ helmsman -destroy -f bee.yaml +``` From 9303c8e5799e94353edf86cd547e81387d0e405b Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 14:50:09 +0100 Subject: [PATCH 2/8] Use image.tag instead of AppVersion for docker image --- charts/bee/Chart.yaml | 4 +--- charts/bee/templates/deployment.yaml | 2 +- charts/bee/values.yaml | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index 154c036..3f81449 100644 --- a/charts/bee/Chart.yaml +++ b/charts/bee/Chart.yaml @@ -14,10 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: latest - -# TODO: check and add keywords, home, sources, maintainers, icon diff --git a/charts/bee/templates/deployment.yaml b/charts/bee/templates/deployment.yaml index 981f4a1..6693c96 100644 --- a/charts/bee/templates/deployment.yaml +++ b/charts/bee/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: - bee diff --git a/charts/bee/values.yaml b/charts/bee/values.yaml index 9833cf2..19a8dd9 100644 --- a/charts/bee/values.yaml +++ b/charts/bee/values.yaml @@ -4,6 +4,7 @@ image: repository: ethersphere/bee + tag: latest pullPolicy: IfNotPresent imagePullSecrets: [] From 4aa25947d4aed692613285e2b76f173afa7d1ccc Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 14:51:51 +0100 Subject: [PATCH 3/8] Update README --- charts/bee/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/bee/README.md b/charts/bee/README.md index 1b67a9f..5ddf132 100644 --- a/charts/bee/README.md +++ b/charts/bee/README.md @@ -84,7 +84,7 @@ apps: namespace: bee description: "Ethereum Swarm Bee" chart: "ethersphere/bee" - version: "0.1.0" + version: "0.1.1" enabled: true wait: true timeout: 120 From e1729055b42502967a225482def0e5f62c80b838 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 15:03:34 +0100 Subject: [PATCH 4/8] Update Chart.yaml details --- charts/bee/Chart.yaml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index 3f81449..e4c3586 100644 --- a/charts/bee/Chart.yaml +++ b/charts/bee/Chart.yaml @@ -1,21 +1,19 @@ apiVersion: v1 +appVersion: latest name: bee +version: 0.1.1 description: Ethereum Swarm Bee Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. +home: https://swarm.ethereum.org +icon: https://swarm-guide.readthedocs.io/en/latest/_images/swarm.png +keywords: + - blockchain + - ethereum + - storage + - swarm + - web3 +maintainers: + - name: svetomir + email: svetomir@ethereum.org +sources: + - https://github.com/ethersphere/bee type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.1 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: latest From 6ea38bbe114ae492fffd4f652b9739755dae11be Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 15:05:18 +0100 Subject: [PATCH 5/8] Update Chart.yaml details --- charts/bee/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index e4c3586..ceafa73 100644 --- a/charts/bee/Chart.yaml +++ b/charts/bee/Chart.yaml @@ -10,10 +10,10 @@ keywords: - ethereum - storage - swarm - - web3 + - web3 maintainers: - name: svetomir email: svetomir@ethereum.org sources: - https://github.com/ethersphere/bee -type: application +type: application \ No newline at end of file From caaeaeb66d22bce60a305f354504db2c86441c01 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 15:06:15 +0100 Subject: [PATCH 6/8] Update Chart.yaml details --- charts/bee/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index ceafa73..b9ec2fa 100644 --- a/charts/bee/Chart.yaml +++ b/charts/bee/Chart.yaml @@ -16,4 +16,4 @@ maintainers: email: svetomir@ethereum.org sources: - https://github.com/ethersphere/bee -type: application \ No newline at end of file +type: application From cca649466f01a68c04c9036db03c2065269b6808 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 15:21:12 +0100 Subject: [PATCH 7/8] Update test --- charts/bee/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/bee/templates/tests/test-connection.yaml b/charts/bee/templates/tests/test-connection.yaml index afbc472..41e08b0 100644 --- a/charts/bee/templates/tests/test-connection.yaml +++ b/charts/bee/templates/tests/test-connection.yaml @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "bee.fullname" . }}:{{ .Values.service.port }}'] + args: ['{{ include "bee.fullname" . }}:{{ int (split ":" .Values.beeConfig.debug_api_addr )._1 }}/health'] restartPolicy: Never From 0c9d21ed8229d83c8bd23d51eb00e1d64e25a9e4 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Wed, 29 Jan 2020 15:52:05 +0100 Subject: [PATCH 8/8] Update test --- charts/bee/templates/tests/test-connection.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/bee/templates/tests/test-connection.yaml b/charts/bee/templates/tests/test-connection.yaml index 41e08b0..afbc472 100644 --- a/charts/bee/templates/tests/test-connection.yaml +++ b/charts/bee/templates/tests/test-connection.yaml @@ -11,5 +11,5 @@ spec: - name: wget image: busybox command: ['wget'] - args: ['{{ include "bee.fullname" . }}:{{ int (split ":" .Values.beeConfig.debug_api_addr )._1 }}/health'] + args: ['{{ include "bee.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never