Skip to content

Commit 299bb1a

Browse files
author
Luvpreet Singh
committed
update(docs): added additional instructions
2 parents ffe4647 + 479301c commit 299bb1a

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

docs/guide/external-dns/setup.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ Adequate roles and policies must be configured in AWS and available to the node(
4141
```
4242
time="2017-09-19T02:51:54Z" level=info msg="config: &{Master: KubeConfig: Sources:[service ingress] Namespace: FQDNTemplate: Compatibility: Provider:aws GoogleProject: DomainFilter:[] AzureConfigFile:/etc/kuberne tes/azure.json AzureResourceGroup: Policy:upsert-only Registry:txt TXTOwnerID:my-identifier TXTPrefix: Interval:1m0s Once:false DryRun:false LogFormat:text MetricsAddress::7979 Debug:false}"
4343
time="2017-09-19T02:51:54Z" level=info msg="Connected to cluster at https://10.3.0.1:443"
44-
<<<<<<< Updated upstream
45-
```
46-
=======
4744
```
4845

4946
## Usage:
@@ -55,4 +52,4 @@ To create a record set in the subdomain, from your ingress which has been create
5552

5653
# for creating record-set
5754
external-dns.alpha.kubernetes.io/hostname: my-app.test-dns.com # give your domain name here
58-
>>>>>>> Stashed changes
55+
>>>>>>> 479301ced134ba0aa5e03e6fed21cddf35396e1e

0 commit comments

Comments
 (0)