From 35347556f3140c061534a729a5ca075a982b88c0 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 30 May 2021 15:12:32 +0200 Subject: [PATCH] update prototype GUI to reflect PR changes --- charts/develop/prototype-gui/Chart.yaml | 2 +- .../prototype-gui/SCALE/questions.yaml | 93 +++++++++++++++++-- 2 files changed, 85 insertions(+), 10 deletions(-) diff --git a/charts/develop/prototype-gui/Chart.yaml b/charts/develop/prototype-gui/Chart.yaml index e37d76a0c7d..b2c9ae1dd90 100644 --- a/charts/develop/prototype-gui/Chart.yaml +++ b/charts/develop/prototype-gui/Chart.yaml @@ -20,4 +20,4 @@ name: prototype-gui sources: - https://github.com/truecharts/apps/tree/master/develop/prototype-gui type: application -version: 0.0.3 +version: 0.0.4 diff --git a/charts/develop/prototype-gui/SCALE/questions.yaml b/charts/develop/prototype-gui/SCALE/questions.yaml index ca28b79d7a2..c38a032b607 100644 --- a/charts/develop/prototype-gui/SCALE/questions.yaml +++ b/charts/develop/prototype-gui/SCALE/questions.yaml @@ -5,6 +5,8 @@ groups: description: "Configure workload deployment" - name: "Container Configuration" description: "additional container configuration" + - name: "App Configuration" + description: "App specific config options" - name: "Networking and Services" description: "Configure Network and Services for container" - name: "Storage and Persistence" @@ -17,8 +19,6 @@ groups: description: "Specify resources/devices to be allocated to workload" - name: "Advanced" description: "Advanced Configuration" - - name: "WARNING" - description: "WARNING" portals: web_portal: protocols: @@ -57,7 +57,7 @@ questions: default: "Deployment" required: true enum: - - value: "Deployment" + - value: "deployment" description: "Deployment" - value: "statefulset" description: "Statefulset" @@ -126,6 +126,12 @@ questions: schema: type: string + - variable: hostNetwork + group: "Networking and Services" + label: "(Advanced) Enable Host Networking" + schema: + type: boolean + default: false - variable: externalInterfaces description: "External Interfaces" label: "(Advanced) External Interfaces" @@ -201,12 +207,81 @@ questions: type: ipaddr cidr: false required: true - - variable: hostNetwork + - variable: externalInterfaces + description: "External Interfaces" + label: "(Advanced) External Interfaces" group: "Networking and Services" - label: "(Advanced) Enable Host Networking" schema: - type: boolean - default: false + type: list + items: + - variable: interfaceConfiguration + description: "Interface Configuration" + label: "Interface Configuration" + schema: + type: dict + $ref: + - "normalize/interfaceConfiguration" + attrs: + - variable: hostInterface + description: "Please specify host interface" + label: "Host Interface" + schema: + type: string + required: true + $ref: + - "definitions/interface" + - variable: ipam + description: "Define how IP Address will be managed" + label: "IP Address Management" + schema: + type: dict + required: true + attrs: + - variable: type + description: "Specify type for IPAM" + label: "IPAM Type" + schema: + type: string + required: true + enum: + - value: "dhcp" + description: "Use DHCP" + - value: "static" + description: "Use static IP" + show_subquestions_if: "static" + subquestions: + - variable: staticIPConfigurations + label: "Static IP Addresses" + schema: + type: list + items: + - variable: staticIP + label: "Static IP" + schema: + type: ipaddr + cidr: true + - variable: staticRoutes + label: "Static Routes" + schema: + type: list + items: + - variable: staticRouteConfiguration + label: "Static Route Configuration" + schema: + type: dict + attrs: + - variable: destination + label: "Destination" + schema: + type: ipaddr + cidr: true + required: true + - variable: gateway + label: "Gateway" + schema: + type: ipaddr + cidr: false + required: true - variable: service group: "Networking and Services" label: "Configure Service(s)" @@ -596,12 +671,12 @@ questions: label: "CPU" schema: type: string - default: "100m" + default: "2000m" - variable: memory label: "Memory (RAM)" schema: type: string - default: "128Mi" + default: "2Gi" - variable: requests label: "(Advanced) Request minimum resources required" schema: