fix(xo-web/kubernetes-recipe): add DNS config (#6678)

See xoa#114
This commit is contained in:
Gabriel Gunullu
2023-04-20 09:43:32 +02:00
committed by GitHub
parent 6e25b7a83a
commit 84b75e8a58
4 changed files with 53 additions and 17 deletions

View File

@@ -20,6 +20,7 @@
- [Backup] Show original error instead of `stream has ended without data`
- [Ova import] Fix Ova import error `No user expected grain marker, received [object Object]` [Forum#60648](https://xcp-ng.org/forum/post/60648) (PR [#6779](https://github.com/vatesfr/xen-orchestra/pull/6779))
- [Continuous Replication] Remove irrelevant _Suspend VDI not available for this suspended VM_ error [Forum#61169](https://xcp-ng.org/forum/post/61169)
- [Kubernetes recipe] Add DNS configuration (PR [#6678](https://github.com/vatesfr/xen-orchestra/pull/6678))
### Packages to release

View File

@@ -2430,10 +2430,13 @@ const messages = {
recipeNumberOfNodesLabel: 'Number of worker nodes',
recipeSshKeyLabel: 'SSH key',
recipeStaticIpAddresses: 'Static IP addresses',
recipeMasterIpAddress: 'Master node IP address',
recipeWorkerIpAddress: 'Worker node { i } IP address',
recipeNetworkMask: 'Network Mask',
recipeMasterIpAddress: 'Master node IP address/subnet mask',
recipeWorkerIpAddress: 'Worker node { i, number } IP address/subnet mask',
recipeGatewayIpAddress: 'Gateway IP address',
recipeNameserverAddresses: 'Nameserver IP addresses',
recipeNameserverAddressesExample: '192.168.1.0,172.16.1.0',
recipeSearches: 'Search domains',
recipeSearchesExample: 'domain.com,search.org',
// Audit
auditActionEvent: 'Action/Event',

View File

@@ -53,6 +53,24 @@ export default decorate([
workerNodeIpAddresses,
})
},
onChangeNameserver(__, ev) {
const { value } = ev.target
const { onChange, value: prevValue } = this.props
const nameservers = value.split(',').map(nameserver => nameserver.trim())
onChange({
...prevValue,
nameservers,
})
},
onChangeSearch(__, ev) {
const { value } = ev.target
const { onChange, value: prevValue } = this.props
const searches = value.split(',').map(search => search.trim())
onChange({
...prevValue,
searches,
})
},
toggleStaticIpAddress(__, ev) {
const { name } = ev.target
const { onChange, value: prevValue } = this.props
@@ -146,18 +164,6 @@ export default decorate([
value={value.masterIpAddress}
/>
</FormGrid.Row>,
<FormGrid.Row key='netmaskRow'>
<label>{_('recipeNetworkMask')}</label>
<input
className='form-control'
name='networkMask'
onChange={effects.onChangeValue}
placeholder={formatMessage(messages.recipeNetworkMask)}
required
type='text'
value={value.networkMask}
/>
</FormGrid.Row>,
<FormGrid.Row key='gatewayRow'>
<label>{_('recipeGatewayIpAddress')}</label>
<input
@@ -170,6 +176,30 @@ export default decorate([
value={value.gatewayIpAddress}
/>
</FormGrid.Row>,
<FormGrid.Row key='nameserverRow'>
<label>{_('recipeNameserverAddresses')}</label>
<input
className='form-control'
name='nameservers'
onChange={effects.onChangeNameserver}
placeholder={formatMessage(messages.recipeNameserverAddressesExample)}
required
type='text'
value={value.nameservers}
/>
</FormGrid.Row>,
<FormGrid.Row key='searchRow'>
<label>{_('recipeSearches')}</label>
<input
className='form-control'
name='search'
onChange={effects.onChangeSearch}
placeholder={formatMessage(messages.recipeSearchesExample)}
required
type='text'
value={value.search}
/>
</FormGrid.Row>,
[...Array(+value.nbNodes)].map((v, i) => (
<FormGrid.Row key={v}>
<label>{_('recipeWorkerIpAddress', { i: i + 1 })}</label>

View File

@@ -55,9 +55,10 @@ export default decorate([
gatewayIpAddress,
masterIpAddress,
masterName,
nameservers,
nbNodes,
network,
networkMask,
searches,
sr,
sshKey,
workerNodeIpAddresses,
@@ -68,9 +69,10 @@ export default decorate([
gatewayIpAddress,
masterIpAddress,
masterName,
nameservers,
nbNodes: +nbNodes,
network: network.id,
networkMask,
searches,
sr: sr.id,
sshKey,
workerNodeIpAddresses,