revert back test chart

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

 apiVersion: v1
-appVersion: v0.6.4
+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.1.0
+version: 1.0.11

test/machinaris/1.0.11/ix_values.yaml

+image:
+  pullPolicy: IfNotPresent
+  repository: ghcr.io/guydavis/machinaris
+  tag: v0.6.1
+updateStrategy: Recreate

test/machinaris/1.1.0/questions.yaml → test/machinaris/1.0.11/questions.yaml

@@ -9,8 +9,6 @@ groups:
     description: "Set the environment that will be visible to the container"
   - name: "Resource Limits"
     description: "Set CPU/memory limits for Kubernetes Pod"
-  - name: "Configure Coins"
-    description: "Configure different coins"
 
 portals:
   web_portal:
@@ -190,20 +188,3 @@ questions:
       type: string
       show_if: [["enableResourceLimits", "=", true]]
       valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
-
-  - variable: enableStor
-    label: "Enable Stor"
-    group: "Configure Coins"
-    schema:
-      type: boolean
-      default: true
-  - variable: coins.7.apiPort.nodePort
-    label: "Machinaris-Stor API Port"
-    group: "Configure Coins"
-    description: "API Port for Machinaris-Stor"
-    schema:
-      type: int
-      min: 9000
-      max: 65535
-      default: 9004
-      show_if: [["enableStor", "=", true]]

test/machinaris/1.0.11/templates/service.yaml

+{{ $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.0/test_values.yaml → test/machinaris/1.0.11/test_values.yaml

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

test/machinaris/1.1.0/ix_values.yaml

-image:
-  pullPolicy: IfNotPresent
-  repository: ghcr.io/guydavis/machinaris
-  tag: v0.6.4
-appVolumeMounts:
-  config:
-    emptyDir: true
-    mountPath: /data
-  plots:
-    emptyDir: true
-    mountPath: /plots
-coins:
- - name: cactus
-   apiPort:
-    nodePort: 90001
-    targetPort: 8936
-   ports:
-    - protocol: TCP
-      containerPort: 8936
-    - protocol: TCP
-      containerPort: 11444
-    - protocol: TCP
-      containerPort: 11447
- - name: chives
-   apiPort:
-    nodePort: 90002
-    targetPort: 8931
-   ports:
-    - protocol: TCP
-      containerPort: 8931
-    - protocol: TCP
-      containerPort: 9699
-    - protocol: TCP
-      containerPort: 9647
- - name: flax
-   apiPort:
-    nodePort: 90003
-    targetPort: 8928
-   ports:
-    - protocol: TCP
-      containerPort: 8928
-    - protocol: TCP
-      containerPort: 6888
-    - protocol: TCP
-      containerPort: 6885
- - name: flora
-   apiPort:
-    nodePort: 90004
-    targetPort: 8932
-   ports:
-    - protocol: TCP
-      containerPort: 8932
-    - protocol: TCP
-      containerPort: 18644
-    - protocol: TCP
-      containerPort: 18647
- - name: hddcoin
-   apiPort:
-    nodePort: 90005
-    targetPort: 8930
-   ports:
-    - protocol: TCP
-      containerPort: 8930
-    - protocol: TCP
-      containerPort: 28444
-    - protocol: TCP
-      containerPort: 28447
- - name: nchain
-   apiPort:
-    nodePort: 90006
-    targetPort: 8929
-   ports:
-    - protocol: TCP
-      containerPort: 8929
-    - protocol: TCP
-      containerPort: 58445
-    - protocol: TCP
-      containerPort: 38447
- - name: stacoin
-   apiPort:
-    nodePort: 90007
-    targetPort: 8934
-   ports:
-    - protocol: TCP
-      containerPort: 8934
-    - protocol: TCP
-      containerPort: 1999
-    - protocol: TCP
-      containerPort: 1692
- - name: stor
-   apiPort:
-    nodePort: 90008
-    targetPort: 8935
-   ports:
-    - protocol: TCP
-      containerPort: 8935
-    - protocol: TCP
-      containerPort: 8668
-    - protocol: TCP
-      containerPort: 8337
-machinaris_ui_port: 31003
-timezone: America/Edmonton
-updateStrategy: Recreate
-nodeIP: 127.0.0.1

test/machinaris/1.1.0/templates/coins-deployment.yaml

-{{- $ref := . }}
-{{- range $coin := $ref.Values.coins }}
-{{ $_ := set $ref "common" (dict "nameSuffix" $coin.name) }}
-apiVersion: {{ template "common.capabilities.deployment.apiVersion" $ref }}
-kind: Deployment
-metadata:
-  name: {{ template "common.names.fullname" $ref }}
-  labels: {{ include "common.labels" $ref | nindent 4 }}
-spec:
-  strategy:
-    type: {{ $ref.Values.updateStrategy }}
-  selector:
-    matchLabels: {{ include "common.labels.selectorLabels" $ref | nindent 6 }}
-  template:
-    metadata:
-      name: {{ template "common.names.fullname" $ref }}
-      labels: {{ include "common.labels.selectorLabels" $ref | nindent 8 }}
-    spec:
-      containers:
-        - name: {{ $ref.Chart.Name }}
-          {{ if $ref.Values.enableResourceLimits }}
-          resources:
-            limits:
-              cpu: {{ $ref.Values.cpuLimit }}
-              memory: {{ $ref.Values.memLimit }}
-          {{ end }}
-          tty: true
-          {{ include "common.containers.imageConfig" (dict "repository" $ref.Values.image.repository "tag" $ref.Values.image.tag "pullPolicy" $ref.Values.image.pullPolicy "postfix" $ref.common.nameSuffix) | nindent 10 }}
-          {{ include "common.containers.configurePorts" $coin | nindent 10 }}
-          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" $ref.Values | nindent 12 }}
-          {{ range $index, $hostPathConfiguration := $ref.Values.extraAppVolumeMounts }}
-            - name: extrappvolume-{{ $index }}
-              mountPath: {{ $hostPathConfiguration.mountPath }}
-          {{ end }}
-          {{ $envList := (default list $ref.Values.environmentVariables) }}
-          {{ $envList = mustAppend $envList (dict "name" "TZ" "value" $ref.Values.timezone) }}
-          {{ $envList = mustAppend $envList (dict "name" "worker_address" "value" $ref.Values.nodeIP) }}
-          {{ $envList = mustAppend $envList (dict "name" "controller_host" "value" $ref.Values.nodeIP) }}
-          {{ $envList = mustAppend $envList (dict "name" "worker_api_port" "value" $coin.apiPort.targetPort) }}
-          {{ $envList = mustAppend $envList (dict "name" "blockchains" "value" $coin.name) }}
-          {{ $envList = mustAppend $envList (dict "name" "plots_dir" "value" $ref.Values.appVolumeMounts.plots.mountPath) }}
-          {{ $envList = mustAppend $envList (dict "name" "mode" "value" "fullnode") }}
-          {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
-      volumes: {{ include "common.storage.configureAppVolumes" $ref.Values | nindent 8 }}
-      {{ range $index, $hostPathConfiguration := $ref.Values.extraAppVolumeMounts }}
-        - name: extrappvolume-{{ $coin.name }}-{{ $index }}
-          hostPath:
-            path: {{ $hostPathConfiguration.hostPath }}
-      {{ end }}
----
-{{- end }}

test/machinaris/1.1.0/templates/service.yaml

-{{ $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 }}
----
-{{ $this := . }}
-{{ range $coin := $this.Values.coins }}
-{{ $ports := list }}
-{{ $_ := set $this "common" (dict "nameSuffix" $coin.name) }}
-{{ range $port := $coin.ports }}
-{{ $ports = mustAppend $ports (dict "name" (printf "%v-%v" $coin.name $port.containerPort) "port" $port.containerPort "targetPort" $port.containerPort) }}
-{{ end }}
-{{ $_ := set $this "commonService" (dict "ports" $ports "type" "ClusterIP" ) }}
-{{ include "common.classes.service" $this }}
----
-{{ $ports := list }}
-{{ $_ := set $this "common" (dict "nameSuffix" $coin.name) }}
-{{ $ports = mustAppend $ports (dict "name" $coin.name "port" $coin.apiPort.nodePort "nodePort" $coin.apiPort.nodePort "targetPort" $coin.apiPort.targetPort) }}
-{{ $_ := set $this "commonService" (dict "ports" $ports "type" "NodePort" "nameSuffix" "api") }}
-{{ include "common.classes.service" $this }}
----
-{{ end }}