Преглед изворни кода

Merge pull request #575 from truenas/NAS-115275

NAS-115275 / 22.12 / Allow users to specify their own webui portals for apps
Waqar Ahmed пре 3 година
родитељ
комит
92c338d8a9
36 измењених фајлова са 114 додато и 4 уклоњено
  1. 0 0
      charts/ix-chart/2207.1.0/.helmignore
  2. 0 0
      charts/ix-chart/2207.1.0/Chart.lock
  3. 1 1
      charts/ix-chart/2207.1.0/Chart.yaml
  4. 0 0
      charts/ix-chart/2207.1.0/README.md
  5. 0 0
      charts/ix-chart/2207.1.0/app-readme.md
  6. 0 0
      charts/ix-chart/2207.1.0/charts/common-2206.0.0.tgz
  7. 56 1
      charts/ix-chart/2207.1.0/questions.yaml
  8. 0 0
      charts/ix-chart/2207.1.0/templates/NOTES.txt
  9. 0 0
      charts/ix-chart/2207.1.0/templates/_containers.tpl
  10. 0 0
      charts/ix-chart/2207.1.0/templates/_helpers.tpl
  11. 0 0
      charts/ix-chart/2207.1.0/templates/_networking.tpl
  12. 0 0
      charts/ix-chart/2207.1.0/templates/_volumes.tpl
  13. 0 0
      charts/ix-chart/2207.1.0/templates/_workload.tpl
  14. 0 0
      charts/ix-chart/2207.1.0/templates/external-interfaces.yaml
  15. 0 0
      charts/ix-chart/2207.1.0/templates/service.yaml
  16. 0 0
      charts/ix-chart/2207.1.0/templates/tests/deployment-check.yaml
  17. 0 0
      charts/ix-chart/2207.1.0/templates/workload.yaml
  18. 0 0
      charts/ix-chart/2207.1.0/test_values.yaml
  19. 0 0
      test/ix-chart/2207.1.0/.helmignore
  20. 0 0
      test/ix-chart/2207.1.0/Chart.lock
  21. 1 1
      test/ix-chart/2207.1.0/Chart.yaml
  22. 0 0
      test/ix-chart/2207.1.0/README.md
  23. 0 0
      test/ix-chart/2207.1.0/app-readme.md
  24. 0 0
      test/ix-chart/2207.1.0/charts/common-2206.0.0.tgz
  25. 56 1
      test/ix-chart/2207.1.0/questions.yaml
  26. 0 0
      test/ix-chart/2207.1.0/templates/NOTES.txt
  27. 0 0
      test/ix-chart/2207.1.0/templates/_containers.tpl
  28. 0 0
      test/ix-chart/2207.1.0/templates/_helpers.tpl
  29. 0 0
      test/ix-chart/2207.1.0/templates/_networking.tpl
  30. 0 0
      test/ix-chart/2207.1.0/templates/_volumes.tpl
  31. 0 0
      test/ix-chart/2207.1.0/templates/_workload.tpl
  32. 0 0
      test/ix-chart/2207.1.0/templates/external-interfaces.yaml
  33. 0 0
      test/ix-chart/2207.1.0/templates/service.yaml
  34. 0 0
      test/ix-chart/2207.1.0/templates/tests/deployment-check.yaml
  35. 0 0
      test/ix-chart/2207.1.0/templates/workload.yaml
  36. 0 0
      test/ix-chart/2207.1.0/test_values.yaml

+ 0 - 0
charts/ix-chart/2207.0.0/.helmignore → charts/ix-chart/2207.1.0/.helmignore


+ 0 - 0
charts/ix-chart/2207.0.0/Chart.lock → charts/ix-chart/2207.1.0/Chart.lock


+ 1 - 1
charts/ix-chart/2207.0.0/Chart.yaml → charts/ix-chart/2207.1.0/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2207.0.0
+version: 2207.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

+ 0 - 0
charts/ix-chart/2207.0.0/README.md → charts/ix-chart/2207.1.0/README.md


+ 0 - 0
charts/ix-chart/2207.0.0/app-readme.md → charts/ix-chart/2207.1.0/app-readme.md


+ 0 - 0
charts/ix-chart/2207.0.0/charts/common-2206.0.0.tgz → charts/ix-chart/2207.1.0/charts/common-2206.0.0.tgz


+ 56 - 1
charts/ix-chart/2207.0.0/questions.yaml → charts/ix-chart/2207.1.0/questions.yaml

@@ -23,9 +23,64 @@ groups:
     description: "Specify resources to be allocated to workload"
   - name: "Resource Limits"
     description: "Set CPU/memory limits for Kubernetes Pod"
-
+  - name: "Portal Configuration"
+    description: "Configure UI web portal"
 
 questions:
+  - variable: enableUIPortal
+    label: "Enable WebUI Portal (only supported in TrueNAS SCALE Bluefin)"
+    description: "Enable webui portal for easier access to workload ( Only valid for TrueNAS SCALE Bluefin )"
+    group: "Portal Configuration"
+    schema:
+      type: boolean
+      default: false
+  - variable: portalDetails
+    label: "WebUI Portal"
+    description: "Configure WebUI Portal"
+    group: "Portal Configuration"
+    schema:
+      show_if: [["enableUIPortal", "=", true]]
+      type: dict
+      attrs:
+        - variable: portalName
+          label: "Portal Name"
+          description: "Specify a UI Portal name to use which would be displayed in the UI"
+          schema:
+            type: string
+            default: "Web Portal"
+        - variable: protocol
+          label: "Protocol for Portal"
+          description: "Specify protocol for portal"
+          schema:
+            type: string
+            default: "http"
+            enum:
+              - value: "http"
+                description: "HTTP Protocol"
+              - value: "https"
+                description: "HTTPS Protocol"
+        - variable: useNodeIP
+          label: "Use Node IP for Portal IP/Domain"
+          schema:
+            type: boolean
+            default: true
+        - variable: host
+          description: "IP/Domain to use for accessing the portal"
+          label: "Portal IP/Domain"
+          schema:
+            show_if: [["useNodeIP", "=", false]]
+            type: string
+            $ref:
+              - "definitions/nodeIP"
+        - variable: port
+          label: "Port"
+          description: "Specify port to be used for Portal access"
+          schema:
+            type: int
+            min: 9000
+            max: 65535
+            default: 15000
+
   # Workload type
   - variable: workloadType
     description: "Please specify type of workload to deploy"

+ 0 - 0
charts/ix-chart/2207.0.0/templates/NOTES.txt → charts/ix-chart/2207.1.0/templates/NOTES.txt


+ 0 - 0
charts/ix-chart/2207.0.0/templates/_containers.tpl → charts/ix-chart/2207.1.0/templates/_containers.tpl


+ 0 - 0
charts/ix-chart/2207.0.0/templates/_helpers.tpl → charts/ix-chart/2207.1.0/templates/_helpers.tpl


+ 0 - 0
charts/ix-chart/2207.0.0/templates/_networking.tpl → charts/ix-chart/2207.1.0/templates/_networking.tpl


+ 0 - 0
charts/ix-chart/2207.0.0/templates/_volumes.tpl → charts/ix-chart/2207.1.0/templates/_volumes.tpl


+ 0 - 0
charts/ix-chart/2207.0.0/templates/_workload.tpl → charts/ix-chart/2207.1.0/templates/_workload.tpl


+ 0 - 0
charts/ix-chart/2207.0.0/templates/external-interfaces.yaml → charts/ix-chart/2207.1.0/templates/external-interfaces.yaml


+ 0 - 0
charts/ix-chart/2207.0.0/templates/service.yaml → charts/ix-chart/2207.1.0/templates/service.yaml


+ 0 - 0
charts/ix-chart/2207.0.0/templates/tests/deployment-check.yaml → charts/ix-chart/2207.1.0/templates/tests/deployment-check.yaml


+ 0 - 0
charts/ix-chart/2207.0.0/templates/workload.yaml → charts/ix-chart/2207.1.0/templates/workload.yaml


+ 0 - 0
charts/ix-chart/2207.0.0/test_values.yaml → charts/ix-chart/2207.1.0/test_values.yaml


+ 0 - 0
test/ix-chart/2207.0.0/.helmignore → test/ix-chart/2207.1.0/.helmignore


+ 0 - 0
test/ix-chart/2207.0.0/Chart.lock → test/ix-chart/2207.1.0/Chart.lock


+ 1 - 1
test/ix-chart/2207.0.0/Chart.yaml → test/ix-chart/2207.1.0/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2207.0.0
+version: 2207.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

+ 0 - 0
test/ix-chart/2207.0.0/README.md → test/ix-chart/2207.1.0/README.md


+ 0 - 0
test/ix-chart/2207.0.0/app-readme.md → test/ix-chart/2207.1.0/app-readme.md


+ 0 - 0
test/ix-chart/2207.0.0/charts/common-2206.0.0.tgz → test/ix-chart/2207.1.0/charts/common-2206.0.0.tgz


+ 56 - 1
test/ix-chart/2207.0.0/questions.yaml → test/ix-chart/2207.1.0/questions.yaml

@@ -23,9 +23,64 @@ groups:
     description: "Specify resources to be allocated to workload"
   - name: "Resource Limits"
     description: "Set CPU/memory limits for Kubernetes Pod"
-
+  - name: "Portal Configuration"
+    description: "Configure UI web portal"
 
 questions:
+  - variable: enableUIPortal
+    label: "Enable WebUI Portal (only supported in TrueNAS SCALE Bluefin)"
+    description: "Enable webui portal for easier access to workload ( Only valid for TrueNAS SCALE Bluefin )"
+    group: "Portal Configuration"
+    schema:
+      type: boolean
+      default: false
+  - variable: portalDetails
+    label: "WebUI Portal"
+    description: "Configure WebUI Portal"
+    group: "Portal Configuration"
+    schema:
+      show_if: [["enableUIPortal", "=", true]]
+      type: dict
+      attrs:
+        - variable: portalName
+          label: "Portal Name"
+          description: "Specify a UI Portal name to use which would be displayed in the UI"
+          schema:
+            type: string
+            default: "Web Portal"
+        - variable: protocol
+          label: "Protocol for Portal"
+          description: "Specify protocol for portal"
+          schema:
+            type: string
+            default: "http"
+            enum:
+              - value: "http"
+                description: "HTTP Protocol"
+              - value: "https"
+                description: "HTTPS Protocol"
+        - variable: useNodeIP
+          label: "Use Node IP for Portal IP/Domain"
+          schema:
+            type: boolean
+            default: true
+        - variable: host
+          description: "IP/Domain to use for accessing the portal"
+          label: "Portal IP/Domain"
+          schema:
+            show_if: [["useNodeIP", "=", false]]
+            type: string
+            $ref:
+              - "definitions/nodeIP"
+        - variable: port
+          label: "Port"
+          description: "Specify port to be used for Portal access"
+          schema:
+            type: int
+            min: 9000
+            max: 65535
+            default: 15000
+
   # Workload type
   - variable: workloadType
     description: "Please specify type of workload to deploy"

+ 0 - 0
test/ix-chart/2207.0.0/templates/NOTES.txt → test/ix-chart/2207.1.0/templates/NOTES.txt


+ 0 - 0
test/ix-chart/2207.0.0/templates/_containers.tpl → test/ix-chart/2207.1.0/templates/_containers.tpl


+ 0 - 0
test/ix-chart/2207.0.0/templates/_helpers.tpl → test/ix-chart/2207.1.0/templates/_helpers.tpl


+ 0 - 0
test/ix-chart/2207.0.0/templates/_networking.tpl → test/ix-chart/2207.1.0/templates/_networking.tpl


+ 0 - 0
test/ix-chart/2207.0.0/templates/_volumes.tpl → test/ix-chart/2207.1.0/templates/_volumes.tpl


+ 0 - 0
test/ix-chart/2207.0.0/templates/_workload.tpl → test/ix-chart/2207.1.0/templates/_workload.tpl


+ 0 - 0
test/ix-chart/2207.0.0/templates/external-interfaces.yaml → test/ix-chart/2207.1.0/templates/external-interfaces.yaml


+ 0 - 0
test/ix-chart/2207.0.0/templates/service.yaml → test/ix-chart/2207.1.0/templates/service.yaml


+ 0 - 0
test/ix-chart/2207.0.0/templates/tests/deployment-check.yaml → test/ix-chart/2207.1.0/templates/tests/deployment-check.yaml


+ 0 - 0
test/ix-chart/2207.0.0/templates/workload.yaml → test/ix-chart/2207.1.0/templates/workload.yaml


+ 0 - 0
test/ix-chart/2207.0.0/test_values.yaml → test/ix-chart/2207.1.0/test_values.yaml