linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the Helm build script (#3248) 

* Update Helm build script to pin the Helm CLI version
* Update Linkerd version in the Helm values file

Signed-off-by: Ivan Sim <ivan@buoyant.io>
This commit is contained in:
Ivan Sim 2019-08-14 16:04:56 -07:00 committed by GitHub
parent 9c62b65c6a
commit e52afc1197
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/helm-build Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
set -e
# trap the last failed command
trap 'printf "Error on exit:\n Exit code: $?\n Failed command: \"$BASH_COMMAND\"\n"' ERR
bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rootdir="$( cd $bindir/.. && pwd )"
$bindir/helm lint $rootdir/charts/partials
$bindir/helm dep up $rootdir/charts/linkerd2
$bindir/helm dep up $rootdir/charts/patch
$bindir/helm lint --set Identity.TrustAnchorsPEM="fake-trust" --set Identity.Issuer.TLS.CrtPEM="fake-cert" --set Identity.Issuer.TLS.KeyPEM="fake-key" --set Identity.Issuer.CrtExpiry="fake-expiry-date" $rootdir/charts/linkerd2

24
bin/helm.sh
View File

@ -1,24 +0,0 @@
#!/bin/bash
set -e
# trap the last failed command
trap 'printf "Error on exit:\n Exit code: $?\n Failed command: \"$BASH_COMMAND\"\n"' ERR
bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rootdir="$( cd $bindir/.. && pwd )"
helm lint $rootdir/charts/partials
helm dep up $rootdir/charts/linkerd2
helm dep up $rootdir/charts/patch
helm lint --set Identity.TrustAnchorsPEM="fake-trust" --set Identity.Issuer.TLS.CrtPEM="fake-cert" --set Identity.Issuer.TLS.KeyPEM="fake-key" --set Identity.Issuer.CrtExpiry="fake-expiry-date" $rootdir/charts/linkerd2
# if tiller is deployed, perform a dry run installation to check for errors
if [ ! -z "$(kubectl get po -l app=helm,name=tiller --all-namespaces)" ]; then
echo "Performing dry run installation"
helm install --name=linkerd --dry-run --set Identity.TrustAnchorsPEM="fake-trust" --set Identity.Issuer.TLS.CrtPEM="fake-cert" --set Identity.Issuer.TLS.KeyPEM="fake-key" --set Identity.Issuer.CrtExpiry="fake-expiry-date" $rootdir/charts/linkerd2 2> /dev/null
echo "Performing dry run installation (HA mode)"
helm install --name=linkerd --dry-run --set Identity.TrustAnchorsPEM="fake-trust" --set Identity.Issuer.TLS.CrtPEM="fake-cert" --set Identity.Issuer.TLS.KeyPEM="fake-key" --set Identity.Issuer.CrtExpiry="fake-expiry-date" -f $rootdir/charts/linkerd2/values.yaml -f $rootdir/charts/linkerd2/values-ha.yaml charts/linkerd2 2> /dev/null
fi

2
charts/linkerd2/Chart.yaml
View File

@ -1,5 +1,5 @@
apiVersion: "v1"
appVersion: edge-19.8.1
appVersion: edge-19.8.2
description: Linkerd gives you observability, reliability, and security for your microservices — with no code change required.
home: https://linkerd.io
keywords:

2
charts/linkerd2/values.yaml
View File

@ -7,7 +7,7 @@ EnableH2Upgrade: true
ImagePullPolicy: &image_pull_policy IfNotPresent
# control plane version. See Proxy section for proxy version
LinkerdVersion: &linkerd_version edge-19.8.1
LinkerdVersion: &linkerd_version edge-19.8.2
Namespace: linkerd
OmitWebhookSideEffects: false