diff --git a/charts/machinaris/1.0.10/.helmignore b/charts/machinaris/1.0.11/.helmignore similarity index 100% rename from charts/machinaris/1.0.10/.helmignore rename to charts/machinaris/1.0.11/.helmignore diff --git a/charts/machinaris/1.0.10/Chart.yaml b/charts/machinaris/1.0.11/Chart.yaml similarity index 92% rename from charts/machinaris/1.0.10/Chart.yaml rename to charts/machinaris/1.0.11/Chart.yaml index c9cfc8dfed..60ba06d412 100644 --- a/charts/machinaris/1.0.10/Chart.yaml +++ b/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 diff --git a/charts/machinaris/1.0.10/README.md b/charts/machinaris/1.0.11/README.md similarity index 100% rename from charts/machinaris/1.0.10/README.md rename to charts/machinaris/1.0.11/README.md diff --git a/charts/machinaris/1.0.10/app-readme.md b/charts/machinaris/1.0.11/app-readme.md similarity index 100% rename from charts/machinaris/1.0.10/app-readme.md rename to charts/machinaris/1.0.11/app-readme.md diff --git a/charts/machinaris/1.0.10/charts/common-2105.0.0.tgz b/charts/machinaris/1.0.11/charts/common-2105.0.0.tgz similarity index 100% rename from charts/machinaris/1.0.10/charts/common-2105.0.0.tgz rename to charts/machinaris/1.0.11/charts/common-2105.0.0.tgz diff --git a/test/machinaris/1.0.10/ix_values.yaml b/charts/machinaris/1.0.11/ix_values.yaml similarity index 87% rename from test/machinaris/1.0.10/ix_values.yaml rename to charts/machinaris/1.0.11/ix_values.yaml index 6e0890efb9..7ec908a19e 100644 --- a/test/machinaris/1.0.10/ix_values.yaml +++ b/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 diff --git a/test/machinaris/1.0.10/questions.yaml b/charts/machinaris/1.0.11/questions.yaml similarity index 96% rename from test/machinaris/1.0.10/questions.yaml rename to charts/machinaris/1.0.11/questions.yaml index 96b652d13a..7b0ae7ff2a 100644 --- a/test/machinaris/1.0.10/questions.yaml +++ b/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" diff --git a/charts/machinaris/1.0.10/requirements.lock b/charts/machinaris/1.0.11/requirements.lock similarity index 100% rename from charts/machinaris/1.0.10/requirements.lock rename to charts/machinaris/1.0.11/requirements.lock diff --git a/test/machinaris/1.0.10/templates/deployment.yaml b/charts/machinaris/1.0.11/templates/deployment.yaml similarity index 95% rename from test/machinaris/1.0.10/templates/deployment.yaml rename to charts/machinaris/1.0.11/templates/deployment.yaml index 7fa3f48ce1..dae15d4f56 100644 --- a/test/machinaris/1.0.10/templates/deployment.yaml +++ b/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 }} diff --git a/charts/machinaris/1.0.10/templates/service.yaml b/charts/machinaris/1.0.11/templates/service.yaml similarity index 100% rename from charts/machinaris/1.0.10/templates/service.yaml rename to charts/machinaris/1.0.11/templates/service.yaml diff --git a/charts/machinaris/1.0.10/test_values.yaml b/charts/machinaris/1.0.11/test_values.yaml similarity index 89% rename from charts/machinaris/1.0.10/test_values.yaml rename to charts/machinaris/1.0.11/test_values.yaml index bad8ac9975..d3554a85a9 100644 --- a/charts/machinaris/1.0.10/test_values.yaml +++ b/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 diff --git a/test/machinaris/1.0.10/.helmignore b/test/machinaris/1.0.11/.helmignore similarity index 100% rename from test/machinaris/1.0.10/.helmignore rename to test/machinaris/1.0.11/.helmignore diff --git a/test/machinaris/1.0.10/Chart.yaml b/test/machinaris/1.0.11/Chart.yaml similarity index 92% rename from test/machinaris/1.0.10/Chart.yaml rename to test/machinaris/1.0.11/Chart.yaml index c9cfc8dfed..60ba06d412 100644 --- a/test/machinaris/1.0.10/Chart.yaml +++ b/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 diff --git a/test/machinaris/1.0.10/README.md b/test/machinaris/1.0.11/README.md similarity index 100% rename from test/machinaris/1.0.10/README.md rename to test/machinaris/1.0.11/README.md diff --git a/test/machinaris/1.0.10/app-readme.md b/test/machinaris/1.0.11/app-readme.md similarity index 100% rename from test/machinaris/1.0.10/app-readme.md rename to test/machinaris/1.0.11/app-readme.md diff --git a/test/machinaris/1.0.10/charts/common-2105.0.0.tgz b/test/machinaris/1.0.11/charts/common-2105.0.0.tgz similarity index 100% rename from test/machinaris/1.0.10/charts/common-2105.0.0.tgz rename to test/machinaris/1.0.11/charts/common-2105.0.0.tgz diff --git a/charts/machinaris/1.0.10/ix_values.yaml b/test/machinaris/1.0.11/ix_values.yaml similarity index 87% rename from charts/machinaris/1.0.10/ix_values.yaml rename to test/machinaris/1.0.11/ix_values.yaml index 6e0890efb9..7ec908a19e 100644 --- a/charts/machinaris/1.0.10/ix_values.yaml +++ b/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 diff --git a/charts/machinaris/1.0.10/questions.yaml b/test/machinaris/1.0.11/questions.yaml similarity index 96% rename from charts/machinaris/1.0.10/questions.yaml rename to test/machinaris/1.0.11/questions.yaml index 96b652d13a..7b0ae7ff2a 100644 --- a/charts/machinaris/1.0.10/questions.yaml +++ b/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" diff --git a/test/machinaris/1.0.10/requirements.lock b/test/machinaris/1.0.11/requirements.lock similarity index 100% rename from test/machinaris/1.0.10/requirements.lock rename to test/machinaris/1.0.11/requirements.lock diff --git a/charts/machinaris/1.0.10/templates/deployment.yaml b/test/machinaris/1.0.11/templates/deployment.yaml similarity index 95% rename from charts/machinaris/1.0.10/templates/deployment.yaml rename to test/machinaris/1.0.11/templates/deployment.yaml index 7fa3f48ce1..dae15d4f56 100644 --- a/charts/machinaris/1.0.10/templates/deployment.yaml +++ b/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 }} diff --git a/test/machinaris/1.0.10/templates/service.yaml b/test/machinaris/1.0.11/templates/service.yaml similarity index 100% rename from test/machinaris/1.0.10/templates/service.yaml rename to test/machinaris/1.0.11/templates/service.yaml diff --git a/test/machinaris/1.0.10/test_values.yaml b/test/machinaris/1.0.11/test_values.yaml similarity index 89% rename from test/machinaris/1.0.10/test_values.yaml rename to test/machinaris/1.0.11/test_values.yaml index bad8ac9975..d3554a85a9 100644 --- a/test/machinaris/1.0.10/test_values.yaml +++ b/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