Skip to content

C
Charts
Unverified Commit 3931e494 authored by Waqar Ahmed's avatar Waqar Ahmed Committed by GitHub
Browse files
Options

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

NAS-113009 / 22.02-RC.2 / Update machinaris to correctly configure worker address
parents 81a6f518 70b0c8db
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 8 deletions
charts/machinaris/1.0.10/Chart.yaml → charts/machinaris/1.0.11/Chart.yaml
View file @ 3931e494
apiVersion: v1 apiVersion: v1
appVersion: v0.6.0 appVersion: v0.6.1
dependencies: dependencies:
- name: common - name: common
repository: file://../../../library/common/2105.0.0 repository: file://../../../library/common/2105.0.0
...@@ -14,4 +14,4 @@ keywords: ...@@ -14,4 +14,4 @@ keywords:
name: machinaris name: machinaris
sources: sources:
- https://github.com/guydavis/machinaris - https://github.com/guydavis/machinaris
version: 1.0.10 version: 1.0.11
charts/machinaris/1.0.10/ix_values.yaml → charts/machinaris/1.0.11/ix_values.yaml
View file @ 3931e494
image: image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
repository: ghcr.io/guydavis/machinaris repository: ghcr.io/guydavis/machinaris
tag: v0.6.0 tag: v0.6.1
updateStrategy: Recreate updateStrategy: Recreate
charts/machinaris/1.0.10/questions.yaml → charts/machinaris/1.0.11/questions.yaml
View file @ 3931e494
...@@ -28,6 +28,16 @@ questions: ...@@ -28,6 +28,16 @@ questions:
type: string type: string
$ref: $ref:
- "definitions/timezone" - "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 - variable: machinaris_ui_port
label: "Machinaris Web UI" label: "Machinaris Web UI"
group: "Networking" group: "Networking"
......
charts/machinaris/1.0.10/templates/deployment.yaml → charts/machinaris/1.0.11/templates/deployment.yaml
View file @ 3931e494
...@@ -44,6 +44,7 @@ spec: ...@@ -44,6 +44,7 @@ spec:
hostPort: 8927 hostPort: 8927
{{ $envList := (default list .Values.environmentVariables) }} {{ $envList := (default list .Values.environmentVariables) }}
{{ $envList = mustAppend $envList (dict "name" "TZ" "value" $.Values.timezone) }} {{ $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 }} {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
{{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
......
charts/machinaris/1.0.10/test_values.yaml → charts/machinaris/1.0.11/test_values.yaml
View file @ 3931e494
...@@ -8,7 +8,8 @@ appVolumeMounts: ...@@ -8,7 +8,8 @@ appVolumeMounts:
image: image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
repository: ghcr.io/guydavis/machinaris repository: ghcr.io/guydavis/machinaris
tag: v0.6.0 tag: v0.6.1
machinaris_ui_port: 31003 machinaris_ui_port: 31003
timezone: America/Edmonton timezone: America/Edmonton
updateStrategy: Recreate updateStrategy: Recreate
nodeIP: 127.0.0.1
test/machinaris/1.0.10/Chart.yaml → test/machinaris/1.0.11/Chart.yaml
View file @ 3931e494
apiVersion: v1 apiVersion: v1
appVersion: v0.6.0 appVersion: v0.6.1
dependencies: dependencies:
- name: common - name: common
repository: file://../../../library/common/2105.0.0 repository: file://../../../library/common/2105.0.0
...@@ -14,4 +14,4 @@ keywords: ...@@ -14,4 +14,4 @@ keywords:
name: machinaris name: machinaris
sources: sources:
- https://github.com/guydavis/machinaris - https://github.com/guydavis/machinaris
version: 1.0.10 version: 1.0.11
test/machinaris/1.0.10/ix_values.yaml → test/machinaris/1.0.11/ix_values.yaml
View file @ 3931e494
image: image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
repository: ghcr.io/guydavis/machinaris repository: ghcr.io/guydavis/machinaris
tag: v0.6.0 tag: v0.6.1
updateStrategy: Recreate updateStrategy: Recreate
test/machinaris/1.0.10/questions.yaml → test/machinaris/1.0.11/questions.yaml
View file @ 3931e494
...@@ -28,6 +28,16 @@ questions: ...@@ -28,6 +28,16 @@ questions:
type: string type: string
$ref: $ref:
- "definitions/timezone" - "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 - variable: machinaris_ui_port
label: "Machinaris Web UI" label: "Machinaris Web UI"
group: "Networking" group: "Networking"
......
test/machinaris/1.0.10/templates/deployment.yaml → test/machinaris/1.0.11/templates/deployment.yaml
View file @ 3931e494
...@@ -44,6 +44,7 @@ spec: ...@@ -44,6 +44,7 @@ spec:
hostPort: 8927 hostPort: 8927
{{ $envList := (default list .Values.environmentVariables) }} {{ $envList := (default list .Values.environmentVariables) }}
{{ $envList = mustAppend $envList (dict "name" "TZ" "value" $.Values.timezone) }} {{ $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 }} {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
{{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
......
test/machinaris/1.0.10/test_values.yaml → test/machinaris/1.0.11/test_values.yaml
View file @ 3931e494
...@@ -8,7 +8,8 @@ appVolumeMounts: ...@@ -8,7 +8,8 @@ appVolumeMounts:
image: image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
repository: ghcr.io/guydavis/machinaris repository: ghcr.io/guydavis/machinaris
tag: v0.6.0 tag: v0.6.1
machinaris_ui_port: 31003 machinaris_ui_port: 31003
timezone: America/Edmonton timezone: America/Edmonton
updateStrategy: Recreate updateStrategy: Recreate
nodeIP: 127.0.0.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment