diff --git a/deployment_files/global/v1.0u/software/charts/kubernetes/dns/coredns.yaml b/deployment_files/global/v1.0u/software/charts/kubernetes/dns/coredns.yaml index 8ac4b8d0..96d56003 100644 --- a/deployment_files/global/v1.0u/software/charts/kubernetes/dns/coredns.yaml +++ b/deployment_files/global/v1.0u/software/charts/kubernetes/dns/coredns.yaml @@ -25,6 +25,44 @@ metadata: path: .images.kubernetes.coredns dest: path: .values.images + + # Zones + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .dns.cluster_domain + dest: + path: .values.conf.coredns.corefile + pattern: 'CLUSTER_DOMAIN' + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .kubernetes.service_cidr + dest: + path: .values.conf.coredns.corefile + pattern: 'SERVICE_CIDR' + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .kubernetes.pod_cidr + dest: + path: .values.conf.coredns.corefile + pattern: 'POD_CIDR' + + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .dns.upstream_servers[0] + dest: + path: .values.conf.coredns.corefile + pattern: 'UPSTREAM1' + - src: + schema: pegleg/CommonAddresses/v1 + name: common-addresses + path: .dns.upstream_servers[1] + dest: + path: .values.conf.coredns.corefile + pattern: 'UPSTREAM2' data: chart_name: coredns release: coredns @@ -34,6 +72,26 @@ data: timeout: 600 upgrade: no_hooks: true + values: + conf: + coredns: + # TODO(alanmeadows) this needs to be adjusted to use substition + corefile: | + .:53 { + errors + health + autopath @kubernetes + kubernetes CLUSTER_DOMAIN SERVICE_CIDR POD_CIDR { + pods insecure + fallthrough in-addr.arpa ip6.arpa + upstream UPSTREAM1 + upstream UPSTREAM2 + } + prometheus :9153 + proxy . UPSTREAM1 + proxy . UPSTREAM2 + cache 30 + } dependencies: - coredns-htk ---