This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push: new a91c6d4 Update for upstream move of version info to PureConfig (#234) a91c6d4 is described below commit a91c6d4f414d139eea92bfb392837d00feb214f1 Author: David Grove <dgrove-...@users.noreply.github.com> AuthorDate: Tue Jun 26 06:57:26 2018 -0400 Update for upstream move of version info to PureConfig (#234) Update Helm chart for upstream PR 3617 that eliminated whisk_version name and moved the version number and date to PureConfig. --- helm/templates/controller.yaml | 6 ++---- helm/templates/invoker.yaml | 2 +- helm/values.yaml | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/helm/templates/controller.yaml b/helm/templates/controller.yaml index 9b65c8a..2b94c73 100644 --- a/helm/templates/controller.yaml +++ b/helm/templates/controller.yaml @@ -69,12 +69,10 @@ spec: - name: "PORT" value: {{ .Values.controller.port | quote }} - - name: "WHISK_VERSION_DATE" + - name: "CONFIG_whisk_info_date" value: {{ dateInZone "2006-01-02-03:04:05Z" (now) "UTC"| quote }} - - name: "WHISK_VERSION_BUILDNO" + - name: "CONFIG_whisk_info_buildNo" value: {{ .Values.whisk.versions.tag | quote }} - - name: "WHISK_VERSION_NAME" - value: {{ .Values.whisk.versions.name | quote }} # Java options - name: "JAVA_OPTS" diff --git a/helm/templates/invoker.yaml b/helm/templates/invoker.yaml index 232d423..2466a7f 100644 --- a/helm/templates/invoker.yaml +++ b/helm/templates/invoker.yaml @@ -113,7 +113,7 @@ spec: value: "" # this version is the day it is deployed, - - name: "WHISK_VERSION_DATE" + - name: "CONFIG_whisk_info_date" value: {{ dateInZone "2006-01-02-03:04:05Z" (now) "UTC"| quote }} # properties for DB connection diff --git a/helm/values.yaml b/helm/values.yaml index 8fe37ea..21d3068 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -32,7 +32,6 @@ whisk: system: "789c46b1-71f6-4ed5-8c54-816aa4f8c502:abczO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP" guest: "23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP" versions: - name: "OpenWhisk" tag: "latest" cli: "latest" systemNameSpace: "/whisk.system"