[GitHub] csantanapr closed pull request #234: Update for upstream move of version info to PureConfig

[GitBox <gi...@apache.org>]

csantanapr closed pull request #234: Update for upstream move of version info to PureConfig
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/234
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services