Merge pull request #146 from truenas/catalog-update-6a02

Upgraded catalog item(s)

charts/machinaris/1.0.5/Chart.yaml → charts/machinaris/1.0.7/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.5.4
+appVersion: v0.5.5
 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.5
+version: 1.0.7

test/machinaris/1.0.6/ix_values.yaml → charts/machinaris/1.0.7/ix_values.yaml

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

test/machinaris/1.0.6/test_values.yaml → charts/machinaris/1.0.7/test_values.yaml

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

test/machinaris/1.0.6/Chart.yaml → test/machinaris/1.0.7/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: v0.5.4
+appVersion: v0.5.5
 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.6
+version: 1.0.7

charts/machinaris/1.0.5/ix_values.yaml → test/machinaris/1.0.7/ix_values.yaml

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

charts/machinaris/1.0.5/questions.yaml → test/machinaris/1.0.7/questions.yaml

@@ -7,6 +7,8 @@ groups:
     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:
@@ -157,3 +159,22 @@ questions:
                 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]*)$"

charts/machinaris/1.0.5/templates/deployment.yaml → test/machinaris/1.0.7/templates/deployment.yaml

@@ -17,6 +17,12 @@ spec:
       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 }}

charts/machinaris/1.0.5/test_values.yaml → test/machinaris/1.0.7/test_values.yaml

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