Merge pull request #210 from truenas/catalog-update-b904

NAS-113009 / 22.02-RC.2 / Update machinaris to correctly configure worker address

charts/machinaris/1.0.10/Chart.yaml → charts/machinaris/1.0.11/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.6.0
+appVersion: v0.6.1
 dependencies:
 - name: common
   repository: file://../../../library/common/2105.0.0
@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.0.10
+version: 1.0.11

test/machinaris/1.0.10/ix_values.yaml → charts/machinaris/1.0.11/ix_values.yaml

@@ -1,5 +1,5 @@
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.0
+  tag: v0.6.1
 updateStrategy: Recreate

test/machinaris/1.0.10/questions.yaml → charts/machinaris/1.0.11/questions.yaml

@@ -28,6 +28,16 @@ questions:
       type: string
       $ref:
         - "definitions/timezone"
+
+  - variable: nodeIP
+    description: "LAN IP address of your TrueNAS server"
+    group: "Machinaris Configuration"
+    label: "Worker Address"
+    schema:
+      type: string
+      $ref:
+        - "definitions/nodeIP"
+
   - variable: machinaris_ui_port
     label: "Machinaris Web UI"
     group: "Networking"

test/machinaris/1.0.10/templates/deployment.yaml → charts/machinaris/1.0.11/templates/deployment.yaml

@@ -44,6 +44,7 @@ spec:
               hostPort: 8927
           {{ $envList := (default list .Values.environmentVariables) }}
           {{ $envList = mustAppend $envList (dict "name" "TZ" "value" $.Values.timezone) }}
+          {{ $envList = mustAppend $envList (dict "name" "worker_address" "value" $.Values.nodeIP) }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
       {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}

charts/machinaris/1.0.10/test_values.yaml → charts/machinaris/1.0.11/test_values.yaml

@@ -8,7 +8,8 @@ appVolumeMounts:
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.0
+  tag: v0.6.1
 machinaris_ui_port: 31003
 timezone: America/Edmonton
 updateStrategy: Recreate
+nodeIP: 127.0.0.1

test/machinaris/1.0.10/Chart.yaml → test/machinaris/1.0.11/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.6.0
+appVersion: v0.6.1
 dependencies:
 - name: common
   repository: file://../../../library/common/2105.0.0
@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.0.10
+version: 1.0.11

charts/machinaris/1.0.10/ix_values.yaml → test/machinaris/1.0.11/ix_values.yaml

@@ -1,5 +1,5 @@
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.0
+  tag: v0.6.1
 updateStrategy: Recreate

charts/machinaris/1.0.10/questions.yaml → test/machinaris/1.0.11/questions.yaml

@@ -28,6 +28,16 @@ questions:
       type: string
       $ref:
         - "definitions/timezone"
+
+  - variable: nodeIP
+    description: "LAN IP address of your TrueNAS server"
+    group: "Machinaris Configuration"
+    label: "Worker Address"
+    schema:
+      type: string
+      $ref:
+        - "definitions/nodeIP"
+
   - variable: machinaris_ui_port
     label: "Machinaris Web UI"
     group: "Networking"

charts/machinaris/1.0.10/templates/deployment.yaml → test/machinaris/1.0.11/templates/deployment.yaml

@@ -44,6 +44,7 @@ spec:
               hostPort: 8927
           {{ $envList := (default list .Values.environmentVariables) }}
           {{ $envList = mustAppend $envList (dict "name" "TZ" "value" $.Values.timezone) }}
+          {{ $envList = mustAppend $envList (dict "name" "worker_address" "value" $.Values.nodeIP) }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
       {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}

test/machinaris/1.0.10/test_values.yaml → test/machinaris/1.0.11/test_values.yaml

@@ -8,7 +8,8 @@ appVolumeMounts:
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.0
+  tag: v0.6.1
 machinaris_ui_port: 31003
 timezone: America/Edmonton
 updateStrategy: Recreate
+nodeIP: 127.0.0.1