Merge pull request #82 from grycap/dev-srisco

Read the 'ONETRIGGER_VERSION' environment variable
grycap · May 14, 2019 · abbdcfd · abbdcfd
2 parents 833e996 + e65c714
commit abbdcfd
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/providers/onpremises/clients/onedata.py b/src/providers/onpremises/clients/onedata.py
@@ -28,7 +28,9 @@ def __init__(self, function_args, onedata_id):
         self.function_name = function_args['name']
         self.onedata_id = onedata_id
         self.endpoint = utils.get_environment_variable("OPENFAAS_ENDPOINT")
-        if 'envVars' in function_args and 'OUTPUT_BUCKET' in function_args['envVars']:    
+        onetrigger_version = utils.get_environment_variable("ONETRIGGER_VERSION")
+        self.onetrigger_version = 'latest' if not onetrigger_version else onetrigger_version
+        if 'envVars' in function_args and 'OUTPUT_BUCKET' in function_args['envVars']:
             self.output_bucket = function_args['envVars']['OUTPUT_BUCKET'].strip('/ ')
         self.oneprovider_host = function_args['envVars']['ONEPROVIDER_HOST']
         self.onedata_access_token = function_args['envVars']['ONEDATA_ACCESS_TOKEN']
@@ -152,7 +154,7 @@ def deploy_onetrigger(self, kubernetes_client):
                         'containers': [
                             {
                                 'name': 'onetrigger',
-                                'image': 'grycap/onetrigger:latest',
+                                'image': 'grycap/onetrigger:{0}'.format(self.onetrigger_version),
                                 'imagePullPolicy': 'Always',
                                 'env': [
                                     {