From 0d86af8488ffb97897efbbe856a6091692854175 Mon Sep 17 00:00:00 2001 From: "M. Rehan" Date: Tue, 5 Apr 2022 23:38:30 +0500 Subject: [PATCH] Enable upgrade strategy of machinaris app --- .../machinaris/{1.1.3 => 1.1.4}/.helmignore | 0 charts/machinaris/{1.1.3 => 1.1.4}/Chart.yaml | 4 +- charts/machinaris/{1.1.3 => 1.1.4}/README.md | 0 .../machinaris/{1.1.3 => 1.1.4}/app-readme.md | 0 .../charts/common-2112.0.0.tgz | Bin .../{1.1.3 => 1.1.4}/ix_values.yaml | 2 +- .../{1.1.3 => 1.1.4}/questions.yaml | 0 .../{1.1.3 => 1.1.4}/requirements.lock | 0 .../{1.1.3 => 1.1.4}/templates/_helpers.tpl | 0 .../templates/coins-deployment.yaml | 0 .../templates/deployment.yaml | 0 .../{1.1.3 => 1.1.4}/templates/service.yaml | 0 .../templates/tests/cactus-check.yaml | 0 .../templates/tests/machinaris-check.yaml | 0 .../machinaris/1.1.4}/test_values.yaml | 2 +- test/machinaris/1.0.11/.helmignore | 23 --- test/machinaris/1.0.11/Chart.yaml | 17 -- test/machinaris/1.0.11/README.md | 9 - test/machinaris/1.0.11/app-readme.md | 4 - .../1.0.11/charts/common-2112.0.0.tgz | Bin 4467 -> 0 bytes test/machinaris/1.0.11/ix_values.yaml | 5 - test/machinaris/1.0.11/questions.yaml | 190 ------------------ test/machinaris/1.0.11/requirements.lock | 6 - .../1.0.11/templates/deployment.yaml | 54 ----- test/machinaris/1.0.11/test_values.yaml | 15 -- test/machinaris/1.1.3/templates/service.yaml | 6 - test/machinaris/{1.1.3 => 1.1.4}/.helmignore | 0 test/machinaris/{1.1.3 => 1.1.4}/Chart.yaml | 4 +- test/machinaris/{1.1.3 => 1.1.4}/README.md | 0 .../machinaris/{1.1.3 => 1.1.4}/app-readme.md | 0 .../charts/common-2112.0.0.tgz | Bin .../{1.1.3 => 1.1.4}/ix_values.yaml | 2 +- .../{1.1.3 => 1.1.4}/questions.yaml | 0 .../{1.1.3 => 1.1.4}/requirements.lock | 0 .../{1.1.3 => 1.1.4}/templates/_helpers.tpl | 0 .../templates/coins-deployment.yaml | 0 .../templates/deployment.yaml | 0 .../{1.0.11 => 1.1.4}/templates/service.yaml | 0 .../templates/tests/cactus-check.yaml | 0 .../templates/tests/machinaris-check.yaml | 0 .../machinaris/1.1.4}/test_values.yaml | 2 +- ...ade_strategy_disabled => upgrade_strategy} | 0 42 files changed, 8 insertions(+), 337 deletions(-) rename charts/machinaris/{1.1.3 => 1.1.4}/.helmignore (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/Chart.yaml (92%) rename charts/machinaris/{1.1.3 => 1.1.4}/README.md (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/app-readme.md (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/charts/common-2112.0.0.tgz (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/ix_values.yaml (99%) rename charts/machinaris/{1.1.3 => 1.1.4}/questions.yaml (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/requirements.lock (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/_helpers.tpl (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/coins-deployment.yaml (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/deployment.yaml (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/service.yaml (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/tests/cactus-check.yaml (100%) rename charts/machinaris/{1.1.3 => 1.1.4}/templates/tests/machinaris-check.yaml (100%) rename {test/machinaris/1.1.3 => charts/machinaris/1.1.4}/test_values.yaml (99%) delete mode 100644 test/machinaris/1.0.11/.helmignore delete mode 100644 test/machinaris/1.0.11/Chart.yaml delete mode 100755 test/machinaris/1.0.11/README.md delete mode 100644 test/machinaris/1.0.11/app-readme.md delete mode 100644 test/machinaris/1.0.11/charts/common-2112.0.0.tgz delete mode 100644 test/machinaris/1.0.11/ix_values.yaml delete mode 100644 test/machinaris/1.0.11/questions.yaml delete mode 100644 test/machinaris/1.0.11/requirements.lock delete mode 100644 test/machinaris/1.0.11/templates/deployment.yaml delete mode 100644 test/machinaris/1.0.11/test_values.yaml delete mode 100644 test/machinaris/1.1.3/templates/service.yaml rename test/machinaris/{1.1.3 => 1.1.4}/.helmignore (100%) rename test/machinaris/{1.1.3 => 1.1.4}/Chart.yaml (92%) rename test/machinaris/{1.1.3 => 1.1.4}/README.md (100%) rename test/machinaris/{1.1.3 => 1.1.4}/app-readme.md (100%) rename test/machinaris/{1.1.3 => 1.1.4}/charts/common-2112.0.0.tgz (100%) rename test/machinaris/{1.1.3 => 1.1.4}/ix_values.yaml (99%) rename test/machinaris/{1.1.3 => 1.1.4}/questions.yaml (100%) rename test/machinaris/{1.1.3 => 1.1.4}/requirements.lock (100%) rename test/machinaris/{1.1.3 => 1.1.4}/templates/_helpers.tpl (100%) rename test/machinaris/{1.1.3 => 1.1.4}/templates/coins-deployment.yaml (100%) rename test/machinaris/{1.1.3 => 1.1.4}/templates/deployment.yaml (100%) rename test/machinaris/{1.0.11 => 1.1.4}/templates/service.yaml (100%) rename test/machinaris/{1.1.3 => 1.1.4}/templates/tests/cactus-check.yaml (100%) rename test/machinaris/{1.1.3 => 1.1.4}/templates/tests/machinaris-check.yaml (100%) rename {charts/machinaris/1.1.3 => test/machinaris/1.1.4}/test_values.yaml (99%) rename test/machinaris/{upgrade_strategy_disabled => upgrade_strategy} (100%) diff --git a/charts/machinaris/1.1.3/.helmignore b/charts/machinaris/1.1.4/.helmignore similarity index 100% rename from charts/machinaris/1.1.3/.helmignore rename to charts/machinaris/1.1.4/.helmignore diff --git a/charts/machinaris/1.1.3/Chart.yaml b/charts/machinaris/1.1.4/Chart.yaml similarity index 92% rename from charts/machinaris/1.1.3/Chart.yaml rename to charts/machinaris/1.1.4/Chart.yaml index ef3a2a6d48..20743042ba 100644 --- a/charts/machinaris/1.1.3/Chart.yaml +++ b/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 diff --git a/charts/machinaris/1.1.3/README.md b/charts/machinaris/1.1.4/README.md similarity index 100% rename from charts/machinaris/1.1.3/README.md rename to charts/machinaris/1.1.4/README.md diff --git a/charts/machinaris/1.1.3/app-readme.md b/charts/machinaris/1.1.4/app-readme.md similarity index 100% rename from charts/machinaris/1.1.3/app-readme.md rename to charts/machinaris/1.1.4/app-readme.md diff --git a/charts/machinaris/1.1.3/charts/common-2112.0.0.tgz b/charts/machinaris/1.1.4/charts/common-2112.0.0.tgz similarity index 100% rename from charts/machinaris/1.1.3/charts/common-2112.0.0.tgz rename to charts/machinaris/1.1.4/charts/common-2112.0.0.tgz diff --git a/charts/machinaris/1.1.3/ix_values.yaml b/charts/machinaris/1.1.4/ix_values.yaml similarity index 99% rename from charts/machinaris/1.1.3/ix_values.yaml rename to charts/machinaris/1.1.4/ix_values.yaml index 997154fb29..b711361f96 100644 --- a/charts/machinaris/1.1.3/ix_values.yaml +++ b/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 diff --git a/charts/machinaris/1.1.3/questions.yaml b/charts/machinaris/1.1.4/questions.yaml similarity index 100% rename from charts/machinaris/1.1.3/questions.yaml rename to charts/machinaris/1.1.4/questions.yaml diff --git a/charts/machinaris/1.1.3/requirements.lock b/charts/machinaris/1.1.4/requirements.lock similarity index 100% rename from charts/machinaris/1.1.3/requirements.lock rename to charts/machinaris/1.1.4/requirements.lock diff --git a/charts/machinaris/1.1.3/templates/_helpers.tpl b/charts/machinaris/1.1.4/templates/_helpers.tpl similarity index 100% rename from charts/machinaris/1.1.3/templates/_helpers.tpl rename to charts/machinaris/1.1.4/templates/_helpers.tpl diff --git a/charts/machinaris/1.1.3/templates/coins-deployment.yaml b/charts/machinaris/1.1.4/templates/coins-deployment.yaml similarity index 100% rename from charts/machinaris/1.1.3/templates/coins-deployment.yaml rename to charts/machinaris/1.1.4/templates/coins-deployment.yaml diff --git a/charts/machinaris/1.1.3/templates/deployment.yaml b/charts/machinaris/1.1.4/templates/deployment.yaml similarity index 100% rename from charts/machinaris/1.1.3/templates/deployment.yaml rename to charts/machinaris/1.1.4/templates/deployment.yaml diff --git a/charts/machinaris/1.1.3/templates/service.yaml b/charts/machinaris/1.1.4/templates/service.yaml similarity index 100% rename from charts/machinaris/1.1.3/templates/service.yaml rename to charts/machinaris/1.1.4/templates/service.yaml diff --git a/charts/machinaris/1.1.3/templates/tests/cactus-check.yaml b/charts/machinaris/1.1.4/templates/tests/cactus-check.yaml similarity index 100% rename from charts/machinaris/1.1.3/templates/tests/cactus-check.yaml rename to charts/machinaris/1.1.4/templates/tests/cactus-check.yaml diff --git a/charts/machinaris/1.1.3/templates/tests/machinaris-check.yaml b/charts/machinaris/1.1.4/templates/tests/machinaris-check.yaml similarity index 100% rename from charts/machinaris/1.1.3/templates/tests/machinaris-check.yaml rename to charts/machinaris/1.1.4/templates/tests/machinaris-check.yaml diff --git a/test/machinaris/1.1.3/test_values.yaml b/charts/machinaris/1.1.4/test_values.yaml similarity index 99% rename from test/machinaris/1.1.3/test_values.yaml rename to charts/machinaris/1.1.4/test_values.yaml index 2dded03ece..3ba639af8a 100644 --- a/test/machinaris/1.1.3/test_values.yaml +++ b/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 diff --git a/test/machinaris/1.0.11/.helmignore b/test/machinaris/1.0.11/.helmignore deleted file mode 100644 index a9fe727881..0000000000 --- a/test/machinaris/1.0.11/.helmignore +++ /dev/null @@ -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 \ No newline at end of file diff --git a/test/machinaris/1.0.11/Chart.yaml b/test/machinaris/1.0.11/Chart.yaml deleted file mode 100644 index 2dd13f5a7f..0000000000 --- a/test/machinaris/1.0.11/Chart.yaml +++ /dev/null @@ -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 diff --git a/test/machinaris/1.0.11/README.md b/test/machinaris/1.0.11/README.md deleted file mode 100755 index 613aec890d..0000000000 --- a/test/machinaris/1.0.11/README.md +++ /dev/null @@ -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. diff --git a/test/machinaris/1.0.11/app-readme.md b/test/machinaris/1.0.11/app-readme.md deleted file mode 100644 index 0e815a115c..0000000000 --- a/test/machinaris/1.0.11/app-readme.md +++ /dev/null @@ -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. diff --git a/test/machinaris/1.0.11/charts/common-2112.0.0.tgz b/test/machinaris/1.0.11/charts/common-2112.0.0.tgz deleted file mode 100644 index 62c214e1c86f187b4288c35d834eba8b277fc364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4467 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 F0054o)rkNA diff --git a/test/machinaris/1.0.11/ix_values.yaml b/test/machinaris/1.0.11/ix_values.yaml deleted file mode 100644 index 7ec908a19e..0000000000 --- a/test/machinaris/1.0.11/ix_values.yaml +++ /dev/null @@ -1,5 +0,0 @@ -image: - pullPolicy: IfNotPresent - repository: ghcr.io/guydavis/machinaris - tag: v0.6.1 -updateStrategy: Recreate diff --git a/test/machinaris/1.0.11/questions.yaml b/test/machinaris/1.0.11/questions.yaml deleted file mode 100644 index 7b0ae7ff2a..0000000000 --- a/test/machinaris/1.0.11/questions.yaml +++ /dev/null @@ -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]*)$" diff --git a/test/machinaris/1.0.11/requirements.lock b/test/machinaris/1.0.11/requirements.lock deleted file mode 100644 index e858f1a03f..0000000000 --- a/test/machinaris/1.0.11/requirements.lock +++ /dev/null @@ -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" diff --git a/test/machinaris/1.0.11/templates/deployment.yaml b/test/machinaris/1.0.11/templates/deployment.yaml deleted file mode 100644 index dae15d4f56..0000000000 --- a/test/machinaris/1.0.11/templates/deployment.yaml +++ /dev/null @@ -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 }} diff --git a/test/machinaris/1.0.11/test_values.yaml b/test/machinaris/1.0.11/test_values.yaml deleted file mode 100644 index d3554a85a9..0000000000 --- a/test/machinaris/1.0.11/test_values.yaml +++ /dev/null @@ -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 diff --git a/test/machinaris/1.1.3/templates/service.yaml b/test/machinaris/1.1.3/templates/service.yaml deleted file mode 100644 index bc10f57869..0000000000 --- a/test/machinaris/1.1.3/templates/service.yaml +++ /dev/null @@ -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 }} diff --git a/test/machinaris/1.1.3/.helmignore b/test/machinaris/1.1.4/.helmignore similarity index 100% rename from test/machinaris/1.1.3/.helmignore rename to test/machinaris/1.1.4/.helmignore diff --git a/test/machinaris/1.1.3/Chart.yaml b/test/machinaris/1.1.4/Chart.yaml similarity index 92% rename from test/machinaris/1.1.3/Chart.yaml rename to test/machinaris/1.1.4/Chart.yaml index ef3a2a6d48..20743042ba 100644 --- a/test/machinaris/1.1.3/Chart.yaml +++ b/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 diff --git a/test/machinaris/1.1.3/README.md b/test/machinaris/1.1.4/README.md similarity index 100% rename from test/machinaris/1.1.3/README.md rename to test/machinaris/1.1.4/README.md diff --git a/test/machinaris/1.1.3/app-readme.md b/test/machinaris/1.1.4/app-readme.md similarity index 100% rename from test/machinaris/1.1.3/app-readme.md rename to test/machinaris/1.1.4/app-readme.md diff --git a/test/machinaris/1.1.3/charts/common-2112.0.0.tgz b/test/machinaris/1.1.4/charts/common-2112.0.0.tgz similarity index 100% rename from test/machinaris/1.1.3/charts/common-2112.0.0.tgz rename to test/machinaris/1.1.4/charts/common-2112.0.0.tgz diff --git a/test/machinaris/1.1.3/ix_values.yaml b/test/machinaris/1.1.4/ix_values.yaml similarity index 99% rename from test/machinaris/1.1.3/ix_values.yaml rename to test/machinaris/1.1.4/ix_values.yaml index 997154fb29..b711361f96 100644 --- a/test/machinaris/1.1.3/ix_values.yaml +++ b/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 diff --git a/test/machinaris/1.1.3/questions.yaml b/test/machinaris/1.1.4/questions.yaml similarity index 100% rename from test/machinaris/1.1.3/questions.yaml rename to test/machinaris/1.1.4/questions.yaml diff --git a/test/machinaris/1.1.3/requirements.lock b/test/machinaris/1.1.4/requirements.lock similarity index 100% rename from test/machinaris/1.1.3/requirements.lock rename to test/machinaris/1.1.4/requirements.lock diff --git a/test/machinaris/1.1.3/templates/_helpers.tpl b/test/machinaris/1.1.4/templates/_helpers.tpl similarity index 100% rename from test/machinaris/1.1.3/templates/_helpers.tpl rename to test/machinaris/1.1.4/templates/_helpers.tpl diff --git a/test/machinaris/1.1.3/templates/coins-deployment.yaml b/test/machinaris/1.1.4/templates/coins-deployment.yaml similarity index 100% rename from test/machinaris/1.1.3/templates/coins-deployment.yaml rename to test/machinaris/1.1.4/templates/coins-deployment.yaml diff --git a/test/machinaris/1.1.3/templates/deployment.yaml b/test/machinaris/1.1.4/templates/deployment.yaml similarity index 100% rename from test/machinaris/1.1.3/templates/deployment.yaml rename to test/machinaris/1.1.4/templates/deployment.yaml diff --git a/test/machinaris/1.0.11/templates/service.yaml b/test/machinaris/1.1.4/templates/service.yaml similarity index 100% rename from test/machinaris/1.0.11/templates/service.yaml rename to test/machinaris/1.1.4/templates/service.yaml diff --git a/test/machinaris/1.1.3/templates/tests/cactus-check.yaml b/test/machinaris/1.1.4/templates/tests/cactus-check.yaml similarity index 100% rename from test/machinaris/1.1.3/templates/tests/cactus-check.yaml rename to test/machinaris/1.1.4/templates/tests/cactus-check.yaml diff --git a/test/machinaris/1.1.3/templates/tests/machinaris-check.yaml b/test/machinaris/1.1.4/templates/tests/machinaris-check.yaml similarity index 100% rename from test/machinaris/1.1.3/templates/tests/machinaris-check.yaml rename to test/machinaris/1.1.4/templates/tests/machinaris-check.yaml diff --git a/charts/machinaris/1.1.3/test_values.yaml b/test/machinaris/1.1.4/test_values.yaml similarity index 99% rename from charts/machinaris/1.1.3/test_values.yaml rename to test/machinaris/1.1.4/test_values.yaml index 2dded03ece..3ba639af8a 100644 --- a/charts/machinaris/1.1.3/test_values.yaml +++ b/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 diff --git a/test/machinaris/upgrade_strategy_disabled b/test/machinaris/upgrade_strategy similarity index 100% rename from test/machinaris/upgrade_strategy_disabled rename to test/machinaris/upgrade_strategy