Skip to content

Commit 1693c11

Browse files
jayunit100jayunit100
committed
Getting rid of the Salt DNS replacements, addded / back.
1 parent 1aec0a0 commit 1693c11

File tree

11 files changed

+59
-53
lines changed

11 files changed

+59
-53
lines changed

‎cluster/addons/dns/coredns/coredns.yaml.base‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ data:
6767
lameduck 5s
6868
}
6969
ready
70-
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
70+
kubernetes __DNS__DOMAIN__ in-addr.arpa ip6.arpa {
7171
pods insecure
7272
fallthrough in-addr.arpa ip6.arpa
7373
ttl 30
@@ -136,7 +136,7 @@ spec:
136136
imagePullPolicy: IfNotPresent
137137
resources:
138138
limits:
139-
memory: __PILLAR__DNS__MEMORY__LIMIT__
139+
memory: __DNS__MEMORY__LIMIT__
140140
requests:
141141
cpu: 100m
142142
memory: 70Mi
@@ -202,7 +202,7 @@ metadata:
202202
spec:
203203
selector:
204204
k8s-app: kube-dns
205-
clusterIP: __PILLAR__DNS__SERVER__
205+
clusterIP: __DNS__SERVER__
206206
ports:
207207
- name: dns
208208
port: 53

‎cluster/addons/dns/coredns/coredns.yaml.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ data:
6767
lameduck 5s
6868
}
6969
ready
70-
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
70+
kubernetes dns_domain in-addr.arpa ip6.arpa {
7171
pods insecure
7272
fallthrough in-addr.arpa ip6.arpa
7373
ttl 30
@@ -136,7 +136,7 @@ spec:
136136
imagePullPolicy: IfNotPresent
137137
resources:
138138
limits:
139-
memory: {{ pillar['dns_memory_limit'] }}
139+
memory: 'dns_memory_limit'
140140
requests:
141141
cpu: 100m
142142
memory: 70Mi
@@ -202,7 +202,7 @@ metadata:
202202
spec:
203203
selector:
204204
k8s-app: kube-dns
205-
clusterIP: {{ pillar['dns_server'] }}
205+
clusterIP: 'dns_server'
206206
ports:
207207
- name: dns
208208
port: 53

‎cluster/addons/dns/coredns/transforms2salt.sed‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
s/__PILLAR__DNS__SERVER__/{{ pillar['dns_server'] }}/g
2-
s/__PILLAR__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
3-
s/__PILLAR__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
4-
s/__PILLAR__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
1+
s/__DNS__SERVER__/{{ pillar['dns_server'] }}/g
2+
s/__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
3+
s/__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
4+
s/__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
55
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

‎cluster/addons/dns/coredns/transforms2sed.sed‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
2-
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
3-
s/__PILLAR__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
4-
s/__PILLAR__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
1+
s/__DNS__SERVER__/$DNS_SERVER_IP/g
2+
s/__DNS__DOMAIN__/$DNS_DOMAIN/g
3+
s/__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
4+
s/__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
55
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

‎cluster/addons/dns/kube-dns/kube-dns.yaml.base‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
spec:
3131
selector:
3232
k8s-app: kube-dns
33-
clusterIP: __PILLAR__DNS__SERVER__
33+
clusterIP: __DNS__SERVER__
3434
ports:
3535
- name: dns
3636
port: 53
@@ -123,7 +123,7 @@ spec:
123123
# guaranteed class. Currently, this container falls into the
124124
# "burstable" category so the kubelet doesn't backoff from restarting it.
125125
limits:
126-
memory: __PILLAR__DNS__MEMORY__LIMIT__
126+
memory: __DNS__MEMORY__LIMIT__
127127
requests:
128128
cpu: 100m
129129
memory: 70Mi
@@ -146,7 +146,7 @@ spec:
146146
initialDelaySeconds: 3
147147
timeoutSeconds: 5
148148
args:
149-
- --domain=__PILLAR__DNS__DOMAIN__.
149+
- --domain=__DNS__DOMAIN__.
150150
- --dns-port=10053
151151
- --config-dir=/kube-dns-config
152152
- --v=2
@@ -193,7 +193,7 @@ spec:
193193
- --no-negcache
194194
- --dns-loop-detect
195195
- --log-facility=-
196-
- --server=/__PILLAR__DNS__DOMAIN__/127.0.0.1#10053
196+
- --server=/__DNS__DOMAIN__/127.0.0.1#10053
197197
- --server=/in-addr.arpa/127.0.0.1#10053
198198
- --server=/ip6.arpa/127.0.0.1#10053
199199
ports:
@@ -232,8 +232,8 @@ spec:
232232
args:
233233
- --v=2
234234
- --logtostderr
235-
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,SRV
236-
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,SRV
235+
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
236+
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
237237
ports:
238238
- containerPort: 10054
239239
name: metrics

‎cluster/addons/dns/kube-dns/kube-dns.yaml.in‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ metadata:
3030
spec:
3131
selector:
3232
k8s-app: kube-dns
33-
clusterIP: {{ pillar['dns_server'] }}
33+
clusterIP: dns_server
3434
ports:
3535
- name: dns
3636
port: 53
@@ -123,7 +123,7 @@ spec:
123123
# guaranteed class. Currently, this container falls into the
124124
# "burstable" category so the kubelet doesn't backoff from restarting it.
125125
limits:
126-
memory: {{ pillar['dns_memory_limit'] }}
126+
memory: 'dns_memory_limit'
127127
requests:
128128
cpu: 100m
129129
memory: 70Mi
@@ -146,7 +146,7 @@ spec:
146146
initialDelaySeconds: 3
147147
timeoutSeconds: 5
148148
args:
149-
- --domain={{ pillar['dns_domain'] }}.
149+
- --domain=dns_domain.
150150
- --dns-port=10053
151151
- --config-dir=/kube-dns-config
152152
- --v=2
@@ -193,7 +193,7 @@ spec:
193193
- --no-negcache
194194
- --dns-loop-detect
195195
- --log-facility=-
196-
- --server=/{{ pillar['dns_domain'] }}/127.0.0.1#10053
196+
- --server=/dns_domain/127.0.0.1#10053
197197
- --server=/in-addr.arpa/127.0.0.1#10053
198198
- --server=/ip6.arpa/127.0.0.1#10053
199199
ports:
@@ -232,8 +232,8 @@ spec:
232232
args:
233233
- --v=2
234234
- --logtostderr
235-
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV
236-
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV
235+
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV
236+
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV
237237
ports:
238238
- containerPort: 10054
239239
name: metrics

‎cluster/addons/dns/kube-dns/transforms2salt.sed‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
s/__PILLAR__DNS__SERVER__/{{ pillar['dns_server'] }}/g
2-
s/__PILLAR__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
3-
s/__PILLAR__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
4-
s/__PILLAR__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
1+
s/__DNS__SERVER__/{{ pillar['dns_server'] }}/g
2+
s/__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
3+
s/__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
4+
s/__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
55
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

‎cluster/addons/dns/kube-dns/transforms2sed.sed‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
2-
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
3-
s/__PILLAR__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
4-
s/__PILLAR__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
1+
s/__DNS__SERVER__/$DNS_SERVER_IP/g
2+
s/__DNS__DOMAIN__/$DNS_DOMAIN/g
3+
s/__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
4+
s/__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
55
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

‎cluster/addons/dns/nodelocaldns/nodelocaldns.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ data:
9696
cache 30
9797
reload
9898
loop
99-
bind __PILLAR__LOCAL__DNS__ __PILLAR__DNS__SERVER__
100-
forward . __PILLAR__UPSTREAM__SERVERS__
99+
bind __LOCAL__DNS__ __DNS__SERVER__
100+
forward . __UPSTREAM__SERVERS__
101101
prometheus :9253
102102
}
103103
---

‎cluster/gce/gci/configure-helper.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2323,10 +2323,10 @@ function setup-coredns-manifest {
23232323
local -r coredns_file="${dst_dir}/0-dns/coredns/coredns.yaml"
23242324
mv "${dst_dir}/0-dns/coredns/coredns.yaml.in" "${coredns_file}"
23252325
# Replace the salt configurations with variable values.
2326-
sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
2327-
sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
2326+
sed -i -e "s@dns_domain@${DNS_DOMAIN}@g" "${coredns_file}"
2327+
sed -i -e "s@dns_server@${DNS_SERVER_IP}@g" "${coredns_file}"
23282328
sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
2329-
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT:-170Mi}@g" "${coredns_file}"
2329+
sed -i -e "s@dns_memory_limit@${DNS_MEMORY_LIMIT:-170Mi}@g" "${coredns_file}"
23302330

23312331
if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
23322332
setup-addon-manifests "addons" "dns-horizontal-autoscaler" "gce"
@@ -2376,9 +2376,9 @@ EOF
23762376
update-prometheus-to-sd-parameters "${kubedns_file}"
23772377
fi
23782378
# Replace the salt configurations with variable values.
2379-
sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
2380-
sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
2381-
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT:-170Mi}@g" "${kubedns_file}"
2379+
sed -i -e "s@dns_domain@${DNS_DOMAIN}@g" "${kubedns_file}"
2380+
sed -i -e "s@dns_server@${DNS_SERVER_IP}@g" "${kubedns_file}"
2381+
sed -i -e "s@dns_memory_limit@${DNS_MEMORY_LIMIT:-170Mi}@g" "${kubedns_file}"
23822382

23832383
if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
23842384
setup-addon-manifests "addons" "dns-horizontal-autoscaler" "gce"
@@ -2393,9 +2393,9 @@ function setup-nodelocaldns-manifest {
23932393
local -r localdns_file="${dst_dir}/0-dns/nodelocaldns/nodelocaldns.yaml"
23942394
setup-addon-custom-yaml "addons" "0-dns/nodelocaldns" "nodelocaldns.yaml" "${CUSTOM_NODELOCAL_DNS_YAML:-}"
23952395
# Replace the sed configurations with variable values.
2396-
sed -i -e "s/__PILLAR__DNS__DOMAIN__/${DNS_DOMAIN}/g" "${localdns_file}"
2397-
sed -i -e "s/__PILLAR__DNS__SERVER__/${DNS_SERVER_IP}/g" "${localdns_file}"
2398-
sed -i -e "s/__PILLAR__LOCAL__DNS__/${LOCAL_DNS_IP}/g" "${localdns_file}"
2396+
sed -i -e "s/_.*_DNS__DOMAIN__/${DNS_DOMAIN}/g" "${localdns_file}"
2397+
sed -i -e "s/_.*_DNS__SERVER__/${DNS_SERVER_IP}/g" "${localdns_file}"
2398+
sed -i -e "s/_.*_LOCAL__DNS__/${LOCAL_DNS_IP}/g" "${localdns_file}"
23992399
}
24002400

24012401
# Sets up the manifests of netd for k8s addons.

0 commit comments

Comments
 (0)