Merge pull request #403 from truenas/machinaris-fixes

NAS-115666 / 22.12 / Enable upgrade strategy of machinaris app

charts/machinaris/1.1.3/Chart.yaml → charts/machinaris/1.1.4/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.6.9
+appVersion: v0.7.1
 dependencies:
 - name: common
   repository: file://../../../library/common/2112.0.0
@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.1.3
+version: 1.1.4

charts/machinaris/1.1.3/ix_values.yaml → charts/machinaris/1.1.4/ix_values.yaml

@@ -110,7 +110,7 @@ hddcoin:
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.9
+  tag: v0.7.1
 maize:
   apiPort: 8933
   farmerPort: 8647

test/machinaris/1.1.3/test_values.yaml → charts/machinaris/1.1.4/test_values.yaml

@@ -49,7 +49,7 @@ farmerPort: 8447
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.9
+  tag: v0.7.1
 machinarisApiPort: 8927
 machinaris_ui_port: 31003
 memLimit: 1G

test/machinaris/1.0.11/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-# OWNERS file for Kubernetes
-OWNERS

test/machinaris/1.0.11/Chart.yaml

@@ -1,17 +0,0 @@
-apiVersion: v1
-appVersion: v0.6.1
-dependencies:
-- name: common
-  repository: file://../../../library/common/2112.0.0
-  version: 2112.0.0
-description: Global, Versioned, peer-to-peer filesystem.
-home: https://github.com/guydavis/machinaris
-icon: https://raw.githubusercontent.com/guydavis/machinaris/main/web/static/favicon.ico
-keywords:
-- storage
-- crypto
-- blockchain
-name: machinaris
-sources:
-- https://github.com/guydavis/machinaris
-version: 1.0.11

test/machinaris/1.0.11/README.md

@@ -1,9 +0,0 @@
-Machinaris
-=====
-
-[MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. Includes Chia, Plotman, MadMax, Chiadog, and Flax in a single Docker image.
-
-Introduction
-------------
-
-This chart bootstraps MACHINARIS deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

test/machinaris/1.0.11/app-readme.md

@@ -1,4 +0,0 @@
-Machinaris
-=====
-
-[MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. Includes Chia, Plotman, MadMax, Chiadog, and Flax in a single Docker image.

test/machinaris/1.0.11/ix_values.yaml

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

test/machinaris/1.0.11/questions.yaml

@@ -1,190 +0,0 @@
-groups:
-  - name: "Networking"
-    description: "Configure Networking for Machinaris"
-  - name: "Machinaris Configuration"
-    description: "Machinaris configuration"
-  - name: "Storage"
-    description: "Configure Storage for Machinaris"
-  - name: "Machinaris Environment Variables"
-    description: "Set the environment that will be visible to the container"
-  - name: "Resource Limits"
-    description: "Set CPU/memory limits for Kubernetes Pod"
-
-portals:
-  web_portal:
-    protocols:
-      - "http"
-    host:
-      - "$node_ip"
-    ports:
-      - "$variable-machinaris_ui_port"
-
-questions:
-  - variable: timezone
-    label: "Configure timezone"
-    group: "Machinaris Configuration"
-    description: "Configure timezone for machinaris"
-    schema:
-      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"
-    description: "Web UI Port for Machinaris"
-    schema:
-      type: int
-      min: 9000
-      max: 65535
-      default: 9003
-  - variable: appVolumeMounts
-    label: "Machinaris Storage"
-    group: "Storage"
-    schema:
-      type: dict
-      attrs:
-        - variable: config
-          label: "Configuration Volume"
-          schema:
-            type: dict
-            attrs:
-              - variable: datasetName
-                label: "Configuration Volume Dataset Name"
-                schema:
-                  type: string
-                  hidden: true
-                  $ref:
-                    - "normalize/ixVolume"
-                  show_if: [["hostPathEnabled", "=", false]]
-                  default: "config"
-                  editable: false
-              - variable: mountPath
-                label: "Configuration Mount Path"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  hidden: true
-                  editable: true
-                  default: "/root/.chia"
-              - variable: hostPathEnabled
-                label: "Enable Custom Host Path for Machinaris Configuration Volume"
-                schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: hostPath
-                      label: "Host Path for Machinaris Configuration Volume"
-                      schema:
-                        type: hostpath
-                        required: true
-        - variable: plots
-          label: "Plot Volume"
-          schema:
-            type: dict
-            attrs:
-              - variable: datasetName
-                label: "Plots Volume Name"
-                schema:
-                  type: string
-                  hidden: true
-                  $ref:
-                    - "normalize/ixVolume"
-                  show_if: [["hostPathEnabled", "=", false]]
-                  default: "plots"
-                  editable: false
-              - variable: mountPath
-                label: "Plots Mount Path"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  hidden: true
-                  editable: false
-                  default: "/plots"
-              - variable: hostPathEnabled
-                label: "Enable Custom Host Path for Machinaris Plots Volume"
-                schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: hostPath
-                      label: "Host Path for Machinaris Plots Volume"
-                      schema:
-                        type: hostpath
-                        required: true
-
-  - variable: extraAppVolumeMounts
-    label: "Machinaris Extra Host Path Volumes"
-    group: "Storage"
-    schema:
-      type: list
-      items:
-        - variable: extraAppVolume
-          label: "Machinaris Host Path Volume"
-          description: "Add an extra host path volume for machinaris application"
-          schema:
-            type: dict
-            attrs:
-              - variable: mountPath
-                label: "Mount Path in Pod"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  required: true
-              - variable: hostPath
-                label: "Host Path"
-                description: "Host path"
-                schema:
-                  type: hostpath
-                  required: true
-
-  - variable: environmentVariables
-    label: "Environment Variables for Machinaris"
-    group: "Machinaris Environment Variables"
-    schema:
-      type: list
-      default: []
-      items:
-        - variable: environmentVariable
-          label: "Environment Variable"
-          schema:
-            type: dict
-            attrs:
-              - variable: name
-                label: "Name"
-                schema:
-                  type: string
-              - variable: value
-                label: "Value"
-                schema:
-                  type: string
-  - variable: enableResourceLimits
-    label: "Enable Pod resource limits"
-    group: "Resource Limits"
-    schema:
-      type: boolean
-  - variable: cpuLimit
-    label: "CPU limit"
-    group: "Resource Limits"
-    schema:
-      type: string
-      show_if: [["enableResourceLimits", "=", true]]
-      valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)"
-  - variable: memLimit
-    label: "Memory limit"
-    group: "Resource Limits"
-    schema:
-      type: string
-      show_if: [["enableResourceLimits", "=", true]]
-      valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"

test/machinaris/1.0.11/requirements.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2112.0.0
-  version: 2112.0.0
-digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0
-generated: "2021-12-06T21:24:36.651122+05:00"

test/machinaris/1.0.11/templates/deployment.yaml

@@ -1,54 +0,0 @@
-apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
-kind: Deployment
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels: {{ include "common.labels" . | nindent 4 }}
-spec:
-  strategy:
-    type: {{ .Values.updateStrategy }}
-  selector:
-    matchLabels: {{ include "common.labels.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      name: {{ template "common.names.fullname" . }}
-      labels: {{ include "common.labels.selectorLabels" . | nindent 8 }}
-    spec:
-      # FIXME: Let's please remove hostnetwork when upstream hostport issue is sorted out with kube-router
-      hostNetwork: true
-      containers:
-        - name: {{ .Chart.Name }}
-          {{ if .Values.enableResourceLimits }}
-          resources:
-            limits:
-              cpu: {{ .Values.cpuLimit }}
-              memory: {{ .Values.memLimit }}
-          {{ end }}
-          tty: true
-          {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
-          {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
-            - name: extrappvolume-{{ $index }}
-              mountPath: {{ $hostPathConfiguration.mountPath }}
-          {{ end }}
-          ports:
-            - name: chia-network
-              protocol: TCP
-              containerPort: 8444
-              hostPort: 8444
-            - name: machinaris-ui
-              protocol: TCP
-              containerPort: 8926
-            - name: machinaris-api
-              protocol: TCP
-              containerPort: 8927
-              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 }}
-        - name: extrappvolume-{{ $index }}
-          hostPath:
-            path: {{ $hostPathConfiguration.hostPath }}
-      {{ end }}

test/machinaris/1.0.11/test_values.yaml

@@ -1,15 +0,0 @@
-appVolumeMounts:
-  config:
-    emptyDir: true
-    mountPath: /data
-  plots:
-    emptyDir: true
-    mountPath: /plots
-image:
-  pullPolicy: IfNotPresent
-  repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.1
-machinaris_ui_port: 31003
-timezone: America/Edmonton
-updateStrategy: Recreate
-nodeIP: 127.0.0.1

test/machinaris/1.1.3/templates/service.yaml

@@ -1,6 +0,0 @@
-{{ $svc := .Values }}
-{{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "pms" "port" $svc.machinaris_ui_port "nodePort" $svc.machinaris_ui_port "targetPort" "machinaris-ui") }}
-{{ $params := . }}
-{{ $_ := set $params "commonService" (dict "ports" $ports "type" "NodePort" ) }}
-{{ include "common.classes.service" $params }}

test/machinaris/1.1.3/Chart.yaml → test/machinaris/1.1.4/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.6.9
+appVersion: v0.7.1
 dependencies:
 - name: common
   repository: file://../../../library/common/2112.0.0
@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.1.3
+version: 1.1.4

test/machinaris/1.1.3/ix_values.yaml → test/machinaris/1.1.4/ix_values.yaml

@@ -110,7 +110,7 @@ hddcoin:
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.9
+  tag: v0.7.1
 maize:
   apiPort: 8933
   farmerPort: 8647

charts/machinaris/1.1.3/test_values.yaml → test/machinaris/1.1.4/test_values.yaml

@@ -49,7 +49,7 @@ farmerPort: 8447
 image:
   pullPolicy: IfNotPresent
   repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.9
+  tag: v0.7.1
 machinarisApiPort: 8927
 machinaris_ui_port: 31003
 memLimit: 1G