Skip to content

Commit

Permalink
fix infoblox-dns value propagation
Browse files Browse the repository at this point in the history
  • Loading branch information
Diaphteiros committed Oct 2, 2020
1 parent 6476ce3 commit 1e5adc0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ The credentials to use Cloudflare DNS consist of a single key `apiToken`, contai

#### Infoblox Credentials and Configuration

For Infoblox DNS, you have to specify `USERNAME` and `PASSWORD`.
Additionally, a `host` and a `version` need to be specified, both directly under `landscape.dns`. See [here](https://github.com/gardener/external-dns-management/blob/master/doc/infoblox/README.md#create-dns-provider) for further information on optional configuration fields.
For Infoblox DNS, you have to specify `USERNAME` and `PASSWORD` in the `credentials` node.
Additionally, a `host` and a `version` need to be specified, both under `landscape.dns.providerConfig`. See [here](https://github.com/gardener/external-dns-management/blob/master/doc/infoblox/README.md#create-dns-provider) for further information on optional configuration fields that can also be specified in `landscape.dns.providerConfig`.


### landscape.identity
Expand Down
24 changes: 13 additions & 11 deletions acre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -501,17 +501,19 @@ validation:
- ["mapfield", "USERNAME"]
- ["mapfield", "PASSWORD"]
config:
- and
- ["mapfield", "host", ["ip"]]
- ["optionalfield", "port", ["type", "int"]]
- ["optionalfield", "sslVerify", ["type", "bool"]]
- ["mapfield", "version"]
- ["optionalfield", "view"]
- ["optionalfield", "httpPoolConnections", ["type", "int"]]
- ["optionalfield", "httpRequestTimeout", ["type", "int"]]
- ["optionalfield", "caCert", ["ca"]]
- ["optionalfield", "maxResults", ["type", "int"]]
- ["optionalfield", "proxyUrl"]
- mapfield
- providerConfig
- - and
- ["mapfield", "host", ["ip"]]
- ["optionalfield", "port", ["type", "int"]]
- ["optionalfield", "sslVerify", ["type", "bool"]]
- ["mapfield", "version"]
- ["optionalfield", "view"]
- ["optionalfield", "httpPoolConnections", ["type", "int"]]
- ["optionalfield", "httpRequestTimeout", ["type", "int"]]
- ["optionalfield", "caCert", ["ca"]]
- ["optionalfield", "maxResults", ["type", "int"]]
- ["optionalfield", "proxyUrl"]
iaas_entry_validators:
basic:
- <<: (( &template ))
Expand Down
2 changes: 2 additions & 0 deletions components/dns-controller/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ spec:
zones: (( .landscape.dns.hostedZoneIDs || ~~ ))
secret_name: (( .settings.fullname "-" provider.name ))
provider_name: (( provider.name ))
providerConfig: (( .landscape.dns.providerConfig || ~~ ))
<<: (( common ))
cname:
dns_fallback: (( .landscape.dashboard.cname.dns || .landscape.dns ))
Expand All @@ -88,6 +89,7 @@ spec:
zones: (( dns_fallback.hostedZoneIDs || ~~ ))
secret_name: (( .settings.fullname "-" provider.name "-cname" ))
provider_name: (( provider.name "-cname" ))
providerConfig: (( .landscape.dns.providerConfig || ~~ ))
<<: (( common ))
helm:
nameOverride: (( settings.fullname ))
Expand Down
1 change: 1 addition & 0 deletions components/dns-controller/manifests/dns_provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ spec:
include:
- (( values.domain ))
zones: (( values.zones || ~~ ))
providerConfig: (( values.providerConfig || ~~ ))

0 comments on commit 1e5adc0

Please sign in to comment.