[worker] Worker compatible with Frinx Machine 6.1 (#385)

Co-authored-by: Jozef Volak <[email protected]>
FRINXio · Jul 8, 2024 · 869247d · 869247d
1 parent 3bb4a03
commit 869247d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/charts/worker/Chart.yaml b/charts/worker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: worker
-version: 3.1.0
-appVersion: "6.0.0"
+version: 4.0.0
+appVersion: "6.1.0"
 description: A Helm chart for conductor workers
 type: application
 home: https://github.com/FRINXio/helm-charts
@@ -10,18 +10,8 @@ maintainers:
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Added default resource limits for init initContainers
-      links:
-        - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/376
-    - kind: added
-      description: Added possibility to disable initContainers
-      links:
-        - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/376
-    - kind: added
-      description: Copy imagePullPolicy setting from container to worker-copy initContainer
+    - kind: changed
+      description: Changed env variables compatible with Frinx Machine 6.1.0
       links:
         - name: GitHub PR
           url: https://github.com/FRINXio/helm-charts/pull/376
diff --git a/charts/worker/README.md b/charts/worker/README.md
@@ -61,6 +61,8 @@ helm uninstall [RELEASE_NAME]
 | `env.X_TENANT_ID` | X_TENANT_ID env variable | `frinx` |
 | `env.X_AUTH_USER_GROUP` | X_AUTH_USER_GROUP env variable | `network-admin` |
 | `env.UNICONFIG_URL_BASE` | UNICONFIG_URL_BASE env variable | `http://uniconfig:8181/rests` |
+| `env.CONDUCTOR_URL_BASE` | CONDUCTOR_URL_BASE env variable | `http://conductor-server:8080/api` |
+| `env.SCHELLAR_URL_BASE` | SCHELLAR_URL_BASE env variable | `http://conductor-server:3000/query` |
 | `configMaps` | Option to attach configmaps into the pod. [See example in values.yaml](https://github.com/FRINXio/helm-charts/blob/main/charts/worker/values.yaml) | |
 | `extraSecrets` | Option to add secrets into the pod. [See example in values.yaml](https://github.com/FRINXio/helm-charts/blob/main/charts/worker/values.yaml) | |
 | `fileSecrets` | Option to attach secrets as a file into the pod. Need to define secret name, env name and target path. [See example in values.yaml](https://github.com/FRINXio/helm-charts/blob/main/charts/worker/values.yaml) | |

diff --git a/charts/worker/values.yaml b/charts/worker/values.yaml
@@ -78,6 +78,8 @@ env:
   X_TENANT_ID: frinx
   X_AUTH_USER_GROUP: network-admin
   UNICONFIG_URL_BASE: http://uniconfig:8181/rests
+  CONDUCTOR_URL_BASE: http://conductor-server:8080/api
+  SCHELLAR_URL_BASE: http://conductor-server:3000/query
 
 configMaps:
   # - name: properties-file