Merge pull request #94 from vidispine/fixes-1.28

add proxy support

Author: gre9ory

azure-pipelines-gated.yml

@@ -25,4 +25,6 @@ jobs:
       - version: "3.10.3"
       - version: "3.11.3"
       - version: "3.12.3"
+      - version: "3.13.2"
+
 

azure-pipelines.yml

@@ -23,7 +23,8 @@ jobs:
       HelmVersions:
       - version: "3.10.3"
       - version: "3.11.3"
-      - version: "3.12.3"   
+      - version: "3.12.3"
+      - version: "3.13.2"
 
 
 - job: CreateRelease

hull-vidispine-addon/Chart.yaml

@@ -3,4 +3,4 @@ apiVersion: v1
 appVersion: 1.28.0
 description: hull-vidispine-addon
 name: hull-vidispine-addon
-version: 1.28.5
+version: 1.28.6

hull-vidispine-addon/README.md

@@ -56,6 +56,9 @@ Describes configuration options. <br>Has exclusively the following sub-fields: <
 | `preScript` | A Powershell script to be executed before the installation jobs endpoints are processed. 
 | `postScript` | A Powershell script to be executed after the installation jobs endpoints are processed. 
 | `productUris` | Product URIs that are can be used in conjunction with the transformations that populate authentication client data such as `hull.vidispine.addon.coruris` and `hull.vidispine.addon.producturis`. <br><br>When populated the entries here will be manipulated according to the transformation and are added to the fields where the transformation is applied. <br><br>Note that this can be automatically populated by a `hull.util.transformation.tpl` from the `hull.config.general.data.endpoints` fields like in the example. | `[]` | `productUris:`<br>`-`&#160;`https://myapp`<br>`-`&#160;`https://myappalternativehost`<br><br>or<br><br>`productUris:`<br>&#160;&#160;`_HULL_TRANSFORMATION_:`<br>&#160;&#160;&#160;&#160;`NAME:`&#160;`hull.util.transformation.tpl`<br>&#160;&#160;&#160;&#160;`CONTENT:`&#160;`"`<br>&#160;&#160;&#160;&#160;&#160;&#160;`[`<br>&#160;&#160;&#160;&#160;&#160;&#160;`{{-`&#160;`(index`&#160;`.`&#160;`\"PARENT\").Values.hull.config.general.data.endpoints.configportal.uri.api`&#160;`-}},`<br>&#160;&#160;&#160;&#160;&#160;&#160;`{{-`&#160;`(index`&#160;`.`&#160;`\"PARENT\").Values.hull.config.general.data.endpoints.configportal.uri.ui`&#160;`-}}`<br>&#160;&#160;&#160;&#160;&#160;&#160;`]"`
+| `proxy.httpProxy` | If set to a non empty string, the value is added as environment variable `HTTP_PROXY` to `hull-install` and `hull-configure` installation containers | `""` | `"http://10.161.172.192:3128"`
+| `proxy.httpsProxy` | If set to a non empty string, the value is added as environment variable `HTTPS_PROXY` to `hull-install` and `hull-configure` installation containers | `""` | `"http://10.161.172.192:3128"`
+| `proxy.noProxy` | If set to a non empty string, the value is added as environment variable `NO_PROXY` to `hull-install` and `hull-configure` installation containers | `""` | `".cluster.local.,.cluster.local,.svc,10.42.0.0/16,10.43.0.0/16"`
 | `debug` | Debug configuration options. | `debug:`<br>&#160;&#160;`ignoreEntityRestCallErrors:`&#160;`false`<br>&#160;&#160;`retriesForEntityRestCall:`&#160;`3`<br>&#160;&#160;`retriesForAuthServiceCall:`&#160;&#160;`5` | `debug:`<br>&#160;&#160;`ignoreEntityRestCallErrors:`&#160;`true`<br>&#160;&#160;`retriesForEntityRestCall:`&#160;`1`<br>&#160;&#160;`retriesForAuthServiceCall:`&#160;`1`
 | `debug.ignoreEntityRestCallErrors` | If `false`, the `hull-install` and `hull-configure` scripts will stop after an error was encountered and the allowed number of retries was exceeded. To instead ignore errors and provide a list of failed `entities` after execution set this value to `true`, This can be useful for debugging potential issues with Helm Charts. | `false` | `true`
 | `debug.retriesForEntityRestCall` | Sets number of retries for each individual GET, PUT, POST and DELETE call before considering the operation failed. | `3` | `1`

hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/Chart.yaml

@@ -6,5 +6,5 @@ name: hull-test
 version: 1.28.0
 dependencies:
   - name: hull
-    version: "1.28.3"
+    version: "1.28.6"
     repository: "https://vidispine.github.io/hull"

hull-vidispine-addon/files/test/HULL/sources/charts/hull-test/charts/hull-1.28.3.tgz

@@ -11,6 +11,10 @@ hull:
             preScript: ""
             postScript: ""
             productUris: []
+            proxy:
+              httpProxy: ""
+              httpsProxy: ""
+              noProxy: ""
             debug:
               ignoreEntityRestCallErrors: false
               retriesForEntityRestCall: 3
@@ -468,11 +472,21 @@ hull:
           containers:
             installation:
               command: ["/bin/sh", "-c"]
-              volumeMounts: _HT/hull.vidispine.addon.sources.folder.volumemounts                
+              volumeMounts: _HT/hull.vidispine.addon.sources.folder.volumemounts
               envFrom:
                 auth:
                   secretRef:
                     name: auth
+              env:
+                HTTP_PROXY:
+                  enabled: _HT?ne (index . "$").Values.hull.config.general.data.installation.config.proxy.httpProxy ""
+                  value: _HT*hull.config.general.data.installation.config.proxy.httpProxy
+                HTTPS_PROXY:
+                  enabled: _HT?ne (index . "$").Values.hull.config.general.data.installation.config.proxy.httpsProxy ""
+                  value: _HT*hull.config.general.data.installation.config.proxy.httpsProxy
+                NO_PROXY:
+                  enabled: _HT?ne (index . "$").Values.hull.config.general.data.installation.config.proxy.noProxy ""
+                  value: _HT*hull.config.general.data.installation.config.proxy.noProxy
           volumes: _HT/hull.vidispine.addon.sources.folder.volumes
 
       'hull-install':