From 337d32cad810682aaafba4ca0f196e59ee35d6df Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 13 Sep 2022 00:40:12 +0300 Subject: [PATCH] fix(apps): add missing dicts on list items (#3754) --- charts/enterprise/metallb/Chart.yaml | 2 +- charts/enterprise/metallb/questions.yaml | 458 ++++++++++--------- charts/incubator/orbital-sync/Chart.yaml | 2 +- charts/incubator/orbital-sync/questions.yaml | 34 +- charts/stable/synapse/Chart.yaml | 2 +- charts/stable/synapse/questions.yaml | 62 +-- 6 files changed, 301 insertions(+), 259 deletions(-) diff --git a/charts/enterprise/metallb/Chart.yaml b/charts/enterprise/metallb/Chart.yaml index 92bdcb034ee..44cdb7dd9b5 100644 --- a/charts/enterprise/metallb/Chart.yaml +++ b/charts/enterprise/metallb/Chart.yaml @@ -25,7 +25,7 @@ sources: - https://github.com/metallb/metallb - https://metallb.universe.tf type: application -version: 4.0.1 +version: 4.0.2 annotations: truecharts.org/catagories: | - core diff --git a/charts/enterprise/metallb/questions.yaml b/charts/enterprise/metallb/questions.yaml index cc5077db4ff..55371c9bdaf 100644 --- a/charts/enterprise/metallb/questions.yaml +++ b/charts/enterprise/metallb/questions.yaml @@ -3,51 +3,57 @@ questions: # Include{global} # Include{controller} - variable: ipAddressPools - group: "App Configuration" + group: App Configuration label: IP Address Pools Object schema: type: list default: [] items: - - variable: name - label: Name - description: Name of the IP address pool + - variable: ipAddressPoolsEntry + label: IP Address Pool Entry schema: - type: string - required: true - default: "" - - variable: autoAssign - label: Auto Assign - description: AutoAssign flag used to prevent MetallB from automatic - allocation for a pool. - schema: - type: boolean - default: true - - variable: avoidBuggyIPs - label: Avoid Buggy IPs - description: AvoidBuggyIPs prevents addresses ending with .0 and .255 - to be used by a pool. - schema: - type: boolean - default: false - - variable: addresses - label: Addresses Pools - description: A list of IP address ranges over which MetalLB has authority. - You can list multiple ranges in a single pool, they will all share - the same settings. Each range can be either a CIDR prefix, or an - explicit start-end range of IPs. - schema: - type: list - default: [] - items: - - variable: addressPoolEntry - label: Address Pool Entry + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: Name of the IP address pool schema: type: string - default: "" required: true + default: "" + - variable: autoAssign + label: Auto Assign + description: AutoAssign flag used to prevent MetallB from automatic + allocation for a pool. + schema: + type: boolean + default: true + - variable: avoidBuggyIPs + label: Avoid Buggy IPs + description: AvoidBuggyIPs prevents addresses ending with .0 and .255 + to be used by a pool. + schema: + type: boolean + default: false + - variable: addresses + label: Addresses Pools + description: A list of IP address ranges over which MetalLB has authority. + You can list multiple ranges in a single pool, they will all share + the same settings. Each range can be either a CIDR prefix, or an + explicit start-end range of IPs. + schema: + type: list + default: [] + items: + - variable: addressPoolEntry + label: Address Pool Entry + schema: + type: string + default: "" + required: true - variable: L2Advertisements - group: "App Configuration" + group: App Configuration label: L2 Advertisements description: L2Advertisement allows to advertise the LoadBalancer IPs provided by the selected pools via L2. @@ -55,27 +61,33 @@ questions: type: list default: [] items: - - variable: name - label: Name - description: Name of the L2 Advertisement + - variable: L2AdvertisementEntry + label: L2 Advertisement Entry schema: - type: string - required: true - default: "" - - variable: addressPools - label: Address Pools - description: The list of IPAddressPools to advertise via this advertisement, - selected by name. - schema: - type: list - default: [] - items: - - variable: addressPoolEntry - label: Address Pool Entry + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: Name of the L2 Advertisement schema: type: string - default: "" required: true + default: "" + - variable: addressPools + label: Address Pools + description: The list of IPAddressPools to advertise via this advertisement, + selected by name. + schema: + type: list + default: [] + items: + - variable: addressPoolEntry + label: Address Pool Entry + schema: + type: string + default: "" + required: true - variable: nodeSelectors label: Node Selectors description: NodeSelectors allows to limit the nodes to announce as @@ -92,7 +104,7 @@ questions: default: "" required: true - variable: Communities - group: "App Configuration" + group: App Configuration label: Communities description: Community is a collection of aliases for communities. Users can define named aliases to be used in the BGPPeer CRD. @@ -100,22 +112,28 @@ questions: type: list default: [] items: - - variable: name - label: Name - description: The name of the alias for the community. + - variable: CommunityEntry + label: Community Entry schema: - type: string - required: true - default: "" - - variable: value - label: Value - description: The BGP community value corresponding to the given name. - schema: - type: string - required: true - default: "" + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: The name of the alias for the community. + schema: + type: string + required: true + default: "" + - variable: value + label: Value + description: The BGP community value corresponding to the given name. + schema: + type: string + required: true + default: "" - variable: Peers - group: "App Configuration" + group: App Configuration label: Peers description: BGPPeer is the Schema for the peers API. schema: @@ -123,99 +141,105 @@ questions: type: list default: [] items: - - variable: name - label: Name - description: The name of the peer. + - variable: PeerEntry + label: Peer Entry schema: - type: string - required: true - default: "" - - variable: bfdProfile - label: BFD Profile - description: The name of the BFD Profile to be used for the BFD session - associated to the BGP session. If not set, the BFD session won't - be set up. - schema: - type: string - default: "" - - variable: ebgpMultiHop - label: EBGP MultiHop - description: TTo set if the BGPPeer is multi-hops away. Needed for - FRR mode only. - schema: - type: boolean - default: false - - variable: holdTime - label: Hold Time - description: Requested BGP hold time, per RFC4271. - schema: - type: int - - variable: keepaliveTime - label: Keep Alive Time - description: Requested BGP keep alive time, per RFC4271. - schema: - type: int - - variable: myASN - label: My ASN - description: AS number to use for the local end of the session. - schema: - type: int - - variable: password - label: Password - description: Authentication password for routers enforcing TCP MD5 - authenticated sessions - schema: - type: string - private: true - default: "" - - variable: peerASN - label: Peer ASN - description: AS number to expect from the remote end of the session. - schema: - type: string - valid_chars: '^[0-9]*$' - default: "" - - variable: peerAddress - label: Peer Address - description: Address to dial when establishing the session. - schema: - type: string - default: "" - - variable: peerPort - label: Peer Port - description: Port to dial when establishing the session. - schema: - type: string - valid_chars: '^[0-9]*$' - default: "" - - variable: routerID - label: Router ID - description: BGP router ID to advertise to the peer - schema: - type: string - default: "" - - variable: sourceAddress - label: Source Address - description: Source address to use when establishing the session. - schema: - type: string - default: "" - - variable: nodeSelectors - label: Node Selectors - description: Only connect to this peer on nodes that match one of - these selectors. - schema: - type: list - default: [] - items: - - variable: nodeSelectorEntry - label: Node Selector Entry + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: The name of the peer. + schema: + type: string + required: true + default: "" + - variable: bfdProfile + label: BFD Profile + description: The name of the BFD Profile to be used for the BFD session + associated to the BGP session. If not set, the BFD session won't + be set up. schema: type: string default: "" - required: true + - variable: ebgpMultiHop + label: EBGP MultiHop + description: TTo set if the BGPPeer is multi-hops away. Needed for + FRR mode only. + schema: + type: boolean + default: false + - variable: holdTime + label: Hold Time + description: Requested BGP hold time, per RFC4271. + schema: + type: int + - variable: keepaliveTime + label: Keep Alive Time + description: Requested BGP keep alive time, per RFC4271. + schema: + type: int + - variable: myASN + label: My ASN + description: AS number to use for the local end of the session. + schema: + type: int + - variable: password + label: Password + description: Authentication password for routers enforcing TCP MD5 + authenticated sessions + schema: + type: string + private: true + default: "" + - variable: peerASN + label: Peer ASN + description: AS number to expect from the remote end of the session. + schema: + type: string + valid_chars: '^[0-9]*$' + default: "" + - variable: peerAddress + label: Peer Address + description: Address to dial when establishing the session. + schema: + type: string + default: "" + - variable: peerPort + label: Peer Port + description: Port to dial when establishing the session. + schema: + type: string + valid_chars: '^[0-9]*$' + default: "" + - variable: routerID + label: Router ID + description: BGP router ID to advertise to the peer + schema: + type: string + default: "" + - variable: sourceAddress + label: Source Address + description: Source address to use when establishing the session. + schema: + type: string + default: "" + - variable: nodeSelectors + label: Node Selectors + description: Only connect to this peer on nodes that match one of + these selectors. + schema: + type: list + default: [] + items: + - variable: nodeSelectorEntry + label: Node Selector Entry + schema: + type: string + default: "" + required: true - variable: BGPAdvertisements - group: "App Configuration" + group: App Configuration label: BGP Advertisements description: BGPAdvertisement allows to advertise the IPs coming from the selected IPAddressPools via BGP. @@ -223,72 +247,78 @@ questions: type: list default: [] items: - - variable: name - label: Name - description: Name of the BGP Advertisement + - variable: BGPAdvertisementEntry + label: BGP Advertisement Entry schema: - type: string - required: true - default: "" - - variable: addressPools - label: Address Pools - description: The list of IPAddressPools to advertise via this advertisement, - selected by name. - schema: - type: list - default: [] - items: - - variable: addressPoolEntry - label: Address Pool Entry + additional_attrs: true + type: dict + attrs: + - variable: name + label: Name + description: Name of the BGP Advertisement schema: type: string - default: "" required: true - - variable: aggregationLength - label: Aggregation Length - description: The aggregation-length advertisement option lets you - "roll up" the /32s into a larger prefix. Defaults to 32. Works for - IPv4 addresses. - schema: - type: string - valid_chars: '^[0-9]*$' - default: "" - - variable: localpref - label: Local Pref - description: The BGP LOCAL_PREF attribute which is used by BGP best - path algorithm, Path with higher localpref is preferred over one - with lower localpref. - schema: - type: string - valid_chars: '^[0-9]*$' - default: "" - - variable: communities - label: Communities - description: The BGP communities to be associated with the announcement. - Each item can be a community of the form 1234:1234 or the name of - an alias defined in the Community CRD. - schema: - type: list - default: [] - items: - - variable: communityEntry - label: Community Entry + default: "" + - variable: addressPools + label: Address Pools + description: The list of IPAddressPools to advertise via this advertisement, + selected by name. + schema: + type: list + default: [] + items: + - variable: addressPoolEntry + label: Address Pool Entry + schema: + type: string + default: "" + required: true + - variable: aggregationLength + label: Aggregation Length + description: The aggregation-length advertisement option lets you + "roll up" the /32s into a larger prefix. Defaults to 32. Works for + IPv4 addresses. schema: type: string + valid_chars: '^[0-9]*$' default: "" - required: true - - variable: peers - label: Peers - description: Peers limits the BGPpeer to advertise the ips of the - selected pools to. When empty, the loadbalancer IP is announced - to all the BGPPeers configured. - schema: - type: list - default: [] - items: - - variable: peerEntry - label: Peer Entry + - variable: localpref + label: Local Pref + description: The BGP LOCAL_PREF attribute which is used by BGP best + path algorithm, Path with higher localpref is preferred over one + with lower localpref. schema: type: string + valid_chars: '^[0-9]*$' default: "" - required: true + - variable: communities + label: Communities + description: The BGP communities to be associated with the announcement. + Each item can be a community of the form 1234:1234 or the name of + an alias defined in the Community CRD. + schema: + type: list + default: [] + items: + - variable: communityEntry + label: Community Entry + schema: + type: string + default: "" + required: true + - variable: peers + label: Peers + description: Peers limits the BGPpeer to advertise the ips of the + selected pools to. When empty, the loadbalancer IP is announced + to all the BGPPeers configured. + schema: + type: list + default: [] + items: + - variable: peerEntry + label: Peer Entry + schema: + type: string + default: "" + required: true diff --git a/charts/incubator/orbital-sync/Chart.yaml b/charts/incubator/orbital-sync/Chart.yaml index aaf9d6c7570..252cee915d0 100644 --- a/charts/incubator/orbital-sync/Chart.yaml +++ b/charts/incubator/orbital-sync/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/orbital-sync - https://github.com/mattwebbio/orbital-sync/pkgs/container/orbital-sync type: application -version: 0.0.3 +version: 0.0.4 annotations: truecharts.org/catagories: | - network diff --git a/charts/incubator/orbital-sync/questions.yaml b/charts/incubator/orbital-sync/questions.yaml index 570431a2909..c87528fcd14 100644 --- a/charts/incubator/orbital-sync/questions.yaml +++ b/charts/incubator/orbital-sync/questions.yaml @@ -46,21 +46,27 @@ questions: type: list default: [] items: - - variable: host - label: Secondary Host Base URL - description: The base URL of your Pi-hole, including the scheme (HTTP or HTTPS) and port but not including a following slash. + - variable: hostEntry + label: "Secondary Host Entry" schema: - type: string - required: true - default: "" - - variable: password - label: Secondary Host Password - description: The password used to log in to the admin interface. - schema: - type: string - required: true - private: true - default: "" + additional_attrs: true + type: dict + attrs: + - variable: host + label: Secondary Host Base URL + description: The base URL of your Pi-hole, including the scheme (HTTP or HTTPS) and port but not including a following slash. + schema: + type: string + required: true + default: "" + - variable: password + label: Secondary Host Password + description: The password used to log in to the admin interface. + schema: + type: string + required: true + private: true + default: "" - variable: env group: Container Configuration label: Image Environment diff --git a/charts/stable/synapse/Chart.yaml b/charts/stable/synapse/Chart.yaml index 84512861f23..b773c2d1e3e 100644 --- a/charts/stable/synapse/Chart.yaml +++ b/charts/stable/synapse/Chart.yaml @@ -25,7 +25,7 @@ name: synapse sources: - https://github.com/truecharts/charts/tree/master/charts/stable/synapse type: application -version: 4.0.40 +version: 4.0.41 annotations: truecharts.org/catagories: | - cloud diff --git a/charts/stable/synapse/questions.yaml b/charts/stable/synapse/questions.yaml index 9f38d56290a..48db683eb8c 100644 --- a/charts/stable/synapse/questions.yaml +++ b/charts/stable/synapse/questions.yaml @@ -247,38 +247,44 @@ questions: type: boolean default: true - variable: trustedKeyServers - label: "Truested Key Servers" + label: "Trusted Key Servers" schema: type: list default: [] items: - - variable: serverName - label: "Server Name" - schema: - type: string - default: "" - - variable: verifyKeys - label: "Verify Keys" - schema: - additional_attrs: true - type: dict - attrs: - - variable: id - label: "id" - schema: - type: string - default: "" - - variable: key - label: "key" - schema: - type: string - default: "" - private: true - - variable: acceptKeysInsecurely - label: "Accept Keys Insecurely" - schema: - type: boolean - default: false + - variable: trustedKeyServersEntry + label: Trusted Key Servers Entry + schema: + additional_attrs: true + type: dict + attrs: + - variable: serverName + label: "Server Name" + schema: + type: string + default: "" + - variable: verifyKeys + label: "Verify Keys" + schema: + additional_attrs: true + type: dict + attrs: + - variable: id + label: "id" + schema: + type: string + default: "" + - variable: key + label: "key" + schema: + type: string + default: "" + private: true + - variable: acceptKeysInsecurely + label: "Accept Keys Insecurely" + schema: + type: boolean + default: false - variable: logging group: "Container Configuration" label: "Logging Configuration"