revert burrow fullname (#17938)

Signed-off-by: Gregory Hill <greg.hill@monax.io>
This commit is contained in:
Greg Hill
2019-10-14 02:46:37 -07:00
committed by Kubernetes Prow Robot
parent b9cade49f2
commit f3d852b477
4 changed files with 12 additions and 6 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: burrow
version: 1.5.0
version: 1.5.1
appVersion: 0.29.0
description: Burrow is a permissionable smart contract machine
home: https://github.com/hyperledger/burrow
+3 -3
View File
@@ -18,12 +18,12 @@ is installed. Two files will be generated, the first of note is `setup.yaml` whi
```bash
curl -LO https://raw.githubusercontent.com/helm/charts/master/stable/burrow/initialize.sh
CHAIN_NODES=4 CHAIN_NAME="my-release" ./initialize.sh
CHAIN_NODES=4 CHAIN_NAME="my-release-burrow" ./initialize.sh
kubectl apply --filename setup.yaml
```
Please note that the variable `$CHAIN_NAME` should be the same as the helm release name specified below. Another file, `addresses.yaml` contains the the equivalent validator
addresses to set in the charts.
Please note that the variable `$CHAIN_NAME` should be the same as the helm release name specified below with the `-burrow` suffix.
Another file, `addresses.yaml` contains the the equivalent validator addresses to set in the charts.
### Deployment
+1 -1
View File
@@ -13,7 +13,7 @@ then
fi
export CHAIN_NODES=${CHAIN_NODES:-4}
export CHAIN_NAME=${CHAIN_NAME:-"my-release"}
export CHAIN_NAME=${CHAIN_NAME:-"my-release-burrow"}
if [ -z $CHAIN_OUTPUT_DIRECTORY ]; then
export CHAIN_OUTPUT_DIRECTORY=`pwd`
fi
+7 -1
View File
@@ -9,12 +9,18 @@ Expand the name of the chart.
{{/*
Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "burrow.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}