chore(common): add additional aliasses for simple hostpath persistence (#1287)

* chore(common): add additional aliasses for simple hostpath persistence

* hmm

* mountpath, dont use null

* use correct type

* whoops

* bump testrc2

charts/incubator/testrc2/Chart.yaml

@@ -21,7 +21,7 @@ name: testrc2
 sources:
 - https://github.com/Jackett/Jackett
 type: application
-version: 0.0.2
+version: 0.0.3
 annotations:
   truecharts.org/catagories: |
     - media

charts/library/common-test/ci/simple-persistence-values.yaml

@@ -29,28 +29,12 @@ probes:
 persistence:
   simple-pvc:
     enabled: true
-    annotationsList: []
-    annotations: {}
-    labelsList: []
-    labels: {}
     type: simplePVC
-    forceName: ""
-    mountPath:
-    readOnly: false
-    nameOverride:
-    storageClass:
-    existingClaim:
-    subPath:
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    retain: false
   simple-hostpath:
     enabled: true
     type: simpleHP
-    hostPath: /usr
+    hostPathSimple: /usr
-    mountPath:
+    setPermissionsSimple: false
-    hostPathType: ""
-    readOnly: false
 
 "ixCertificateAuthorities": {}
 "ixCertificates":

charts/library/common/Chart.yaml

@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 8.5.0
+version: 8.5.1

charts/library/common/templates/classes/_pvc.tpl

@@ -42,7 +42,7 @@ spec:
     - {{ ( $values.accessMode | default "ReadWriteOnce" ) | quote }}
   resources:
     requests:
-      storage: {{ $values.size | default "100Gi" | quote }}
+      storage: {{ $values.size | default "999Gi" | quote }}
   {{- if $values.storageClass }}
   storageClassName: {{ if (eq "-" $values.storageClass) }}""{{- else if (eq "SCALE-ZFS" $values.storageClass ) }}{{ ( printf "%v-%v"  "ix-storage-class" .Release.Name ) }}{{- else }}{{ $values.storageClass | quote }}{{- end }}
   {{- else if $.Values.global.isSCALE }}

charts/library/common/templates/lib/chart/_values.tpl

@@ -254,6 +254,12 @@
   {{- end }}
   {{- if eq .type "simpleHP" }}
   {{- $_ := set . "type" "hostPath" }}
+  {{- if .setPermissionsSimple }}
+  {{- $_ := set . "setPermissions" .setPermissionsSimple }}
+  {{- end }}
+  {{- if .hostPathSimple }}
+  {{- $_ := set . "hostPath" .hostPathSimple }}
+  {{- end }}
   {{- end }}
   {{- end }}
   {{- end }}

charts/library/common/values.yaml

@@ -675,9 +675,30 @@ persistence:
     type: hostPath
     # -- Which path on the host should be mounted.
     hostPath: /dev
+    # -- Automatic set permissions using chown and chmod
+    setPermissions: false
     # -- Where to mount the path in the main container.
     # Defaults to the value of `hostPath`
-    mountPath:  # /myDev
+    mountPath: "" # /myDev
+    # -- Specifying a hostPathType adds a check before trying to mount the path.
+    # See Kubernetes documentation for options.
+    hostPathType: ""
+    # -- Specify if the path should be mounted read-only.
+    readOnly: true
+
+  # -- Example of a Simple hostPath mount
+  # [[ref]]https://kubernetes.io/docs/concepts/storage/volumes/#hostpath)
+  # @default -- See below
+  host-simple-dev:
+    enabled: false
+    type: simpleHP
+    # -- Which path on the host should be mounted.
+    hostPathSimple: /dev
+    # -- Automatic set permissions using chown and chmod
+    setPermissionsSimple: false
+    # -- Where to mount the path in the main container.
+    # Defaults to the value of `hostPath`
+    mountPath: "" # /myDev
     # -- Specifying a hostPathType adds a check before trying to mount the path.
     # See Kubernetes documentation for options.
     hostPathType: ""

templates/questions/persistenceList.yaml

@@ -33,11 +33,18 @@
                       description: "pvc"
                     - value: "hostPath"
                       description: "hostPath"
+              - variable: setPermissionsSimple
+                label: "Automatic Permissions"
+                description: "Automatically set permissions on install"
+                schema:
+                  show_if: [["type", "=", "simpleHP"]]
+                  type: boolean
+                  default: true
               - variable: setPermissions
                 label: "Automatic Permissions"
                 description: "Automatically set permissions on install"
                 schema:
-                  show_if: [["type", "=", "hostPath"],["type", "=", "simpleHP"]]
+                  show_if: [["type", "=", "hostPath"]]
                   type: boolean
                   default: true
               - variable: readOnly
@@ -45,11 +52,17 @@
                 schema:
                   type: boolean
                   default: false
+              - variable: hostPathSimple
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "simpleHP"]]
+                  type: hostpath
               - variable: hostPath
                 label: "hostPath"
                 description: "Path inside the container the storage is mounted"
                 schema:
-                  show_if: [["type", "=", "hostPath"],["type", "=", "simpleHP"]]
+                  show_if: [["type", "=", "hostPath"]]
                   type: hostpath
               - variable: mountPath
                 label: "mountPath"
@@ -73,9 +86,9 @@
               - variable: size
                 label: "Size quotum of storage"
                 schema:
-                  show_if: [["type", "=", "pvc"],["type", "=", "simplePVC"]]
+                  show_if: [["type", "=", "pvc"]]
                   type: string
-                  default: "100Gi"
+                  default: "999Gi"
               - variable: hostPathType
                 label: "(Advanced) hostPath Type"
                 schema: