Skip to content

Commit

Permalink
Merge 65208db into 9eb829a
Browse files Browse the repository at this point in the history
  • Loading branch information
devkid committed Feb 18, 2020
2 parents 9eb829a + 65208db commit dfc8a08
Show file tree
Hide file tree
Showing 32 changed files with 316 additions and 213 deletions.
7 changes: 2 additions & 5 deletions docs/tutorials/akamai-fastdns.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down Expand Up @@ -192,4 +189,4 @@ spec:


**Important!**: Don't run dig, nslookup or similar immediately. You'll get hit by [negative DNS caching](https://tools.ietf.org/html/rfc2308), which is hard to flush.
Wait about 30s-1m (interval for external-dns to kick in)
Wait about 30s-1m (interval for external-dns to kick in)
5 changes: 1 addition & 4 deletions docs/tutorials/alibabacloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/aws-sd.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
12 changes: 3 additions & 9 deletions docs/tutorials/azure-private-dns.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,7 @@ metadata:
name: externaldns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down Expand Up @@ -268,10 +265,7 @@ metadata:
name: externaldns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down Expand Up @@ -399,4 +393,4 @@ $ az network private-dns record-set a list -g externaldns -z example.com

Substitute the zone for the one created above if a different domain was used.

This should show the external IP address of the service as the A record for your domain ('@' indicates the record is for the zone itself).
This should show the external IP address of the service as the A record for your domain ('@' indicates the record is for the zone itself).
10 changes: 2 additions & 8 deletions docs/tutorials/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down Expand Up @@ -298,10 +295,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/cloudflare.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/contour.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/coredns.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/designate.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/digitalocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/dnsimple.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/exoscale.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/hostport.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/infoblox.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/istio.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/linode.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/nginx-ingress.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/ns1.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/oracle.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/pdns.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/rcodezero.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/rdns.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
2 changes: 2 additions & 0 deletions docs/tutorials/rfc2136.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ rules:
- ""
resources:
- services
- endpoints
- pods
verbs:
- get
- watch
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/transip.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
5 changes: 1 addition & 4 deletions docs/tutorials/vinyldns.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,7 @@ metadata:
name: external-dns
rules:
- apiGroups: [""]
resources: ["services"]
verbs: ["get","watch","list"]
- apiGroups: [""]
resources: ["pods"]
resources: ["services","endpoints","pods"]
verbs: ["get","watch","list"]
- apiGroups: ["extensions"]
resources: ["ingresses"]
Expand Down
39 changes: 20 additions & 19 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,26 @@ func main() {

// Create a source.Config from the flags passed by the user.
sourceCfg := &source.Config{
Namespace: cfg.Namespace,
AnnotationFilter: cfg.AnnotationFilter,
FQDNTemplate: cfg.FQDNTemplate,
CombineFQDNAndAnnotation: cfg.CombineFQDNAndAnnotation,
IgnoreHostnameAnnotation: cfg.IgnoreHostnameAnnotation,
Compatibility: cfg.Compatibility,
PublishInternal: cfg.PublishInternal,
PublishHostIP: cfg.PublishHostIP,
ConnectorServer: cfg.ConnectorSourceServer,
CRDSourceAPIVersion: cfg.CRDSourceAPIVersion,
CRDSourceKind: cfg.CRDSourceKind,
KubeConfig: cfg.KubeConfig,
KubeMaster: cfg.Master,
ServiceTypeFilter: cfg.ServiceTypeFilter,
IstioIngressGatewayServices: cfg.IstioIngressGatewayServices,
CFAPIEndpoint: cfg.CFAPIEndpoint,
CFUsername: cfg.CFUsername,
CFPassword: cfg.CFPassword,
ContourLoadBalancerService: cfg.ContourLoadBalancerService,
Namespace: cfg.Namespace,
AnnotationFilter: cfg.AnnotationFilter,
FQDNTemplate: cfg.FQDNTemplate,
CombineFQDNAndAnnotation: cfg.CombineFQDNAndAnnotation,
IgnoreHostnameAnnotation: cfg.IgnoreHostnameAnnotation,
Compatibility: cfg.Compatibility,
PublishInternal: cfg.PublishInternal,
PublishHostIP: cfg.PublishHostIP,
AlwaysPublishNotReadyAddresses: cfg.AlwaysPublishNotReadyAddresses,
ConnectorServer: cfg.ConnectorSourceServer,
CRDSourceAPIVersion: cfg.CRDSourceAPIVersion,
CRDSourceKind: cfg.CRDSourceKind,
KubeConfig: cfg.KubeConfig,
KubeMaster: cfg.Master,
ServiceTypeFilter: cfg.ServiceTypeFilter,
IstioIngressGatewayServices: cfg.IstioIngressGatewayServices,
CFAPIEndpoint: cfg.CFAPIEndpoint,
CFUsername: cfg.CFUsername,
CFPassword: cfg.CFPassword,
ContourLoadBalancerService: cfg.ContourLoadBalancerService,
}

// Lookup all the selected sources by names and pass them the desired configuration.
Expand Down
Loading

0 comments on commit dfc8a08

Please sign in to comment.