github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93836 from jayunit100/salt_cleanup_92835

Browse Source 
remove __pillar__ refs
This commit is contained in:
Kubernetes Prow Robot
2020-10-11 17:58:47 -07:00
committed by GitHub
parent 7680a85b3b c6a4a87ff2
commit c1e5e6a556
10 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/addons/dns/coredns/coredns.yaml.base
View File

@@ -67,7 +67,7 @@ data:
lameduck 5s
}
ready
kubernetes __PILLAR__DNS__DOMAIN__ in-addr.arpa ip6.arpa {
kubernetes __DNS__DOMAIN__ in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
ttl 30
@@ -136,7 +136,7 @@ spec:
imagePullPolicy: IfNotPresent
resources:
limits:
memory: __PILLAR__DNS__MEMORY__LIMIT__
memory: __DNS__MEMORY__LIMIT__
requests:
cpu: 100m
memory: 70Mi
@@ -202,7 +202,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: __PILLAR__DNS__SERVER__
clusterIP: __DNS__SERVER__
ports:
- name: dns
port: 53

6
cluster/addons/dns/coredns/coredns.yaml.in
View File

@@ -67,7 +67,7 @@ data:
lameduck 5s
}
ready
kubernetes {{ pillar['dns_domain'] }} in-addr.arpa ip6.arpa {
kubernetes dns_domain in-addr.arpa ip6.arpa {
pods insecure
fallthrough in-addr.arpa ip6.arpa
ttl 30
@@ -136,7 +136,7 @@ spec:
imagePullPolicy: IfNotPresent
resources:
limits:
memory: {{ pillar['dns_memory_limit'] }}
memory: 'dns_memory_limit'
requests:
cpu: 100m
memory: 70Mi
@@ -202,7 +202,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: {{ pillar['dns_server'] }}
clusterIP: 'dns_server'
ports:
- name: dns
port: 53

8
cluster/addons/dns/coredns/transforms2salt.sed
View File

@@ -1,5 +1,5 @@
s/__PILLAR__DNS__SERVER__/{{ pillar['dns_server'] }}/g
s/__PILLAR__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
s/__PILLAR__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
s/__PILLAR__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
s/__DNS__SERVER__/{{ pillar['dns_server'] }}/g
s/__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
s/__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
s/__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

8
cluster/addons/dns/coredns/transforms2sed.sed
View File

@@ -1,5 +1,5 @@
s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
s/__PILLAR__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
s/__PILLAR__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
s/__DNS__SERVER__/$DNS_SERVER_IP/g
s/__DNS__DOMAIN__/$DNS_DOMAIN/g
s/__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
s/__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

12
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@@ -30,7 +30,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: __PILLAR__DNS__SERVER__
clusterIP: __DNS__SERVER__
ports:
- name: dns
port: 53
@@ -123,7 +123,7 @@ spec:
# guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it.
limits:
memory: __PILLAR__DNS__MEMORY__LIMIT__
memory: __DNS__MEMORY__LIMIT__
requests:
cpu: 100m
memory: 70Mi
@@ -146,7 +146,7 @@ spec:
initialDelaySeconds: 3
timeoutSeconds: 5
args:
- --domain=__PILLAR__DNS__DOMAIN__.
- --domain=__DNS__DOMAIN__.
- --dns-port=10053
- --config-dir=/kube-dns-config
- --v=2
@@ -193,7 +193,7 @@ spec:
- --no-negcache
- --dns-loop-detect
- --log-facility=-
- --server=/__PILLAR__DNS__DOMAIN__/127.0.0.1#10053
- --server=/__DNS__DOMAIN__/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
ports:
@@ -232,8 +232,8 @@ spec:
args:
- --v=2
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__PILLAR__DNS__DOMAIN__,5,SRV
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.__DNS__DOMAIN__,5,SRV
ports:
- containerPort: 10054
name: metrics

12
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@@ -30,7 +30,7 @@ metadata:
spec:
selector:
k8s-app: kube-dns
clusterIP: {{ pillar['dns_server'] }}
clusterIP: dns_server
ports:
- name: dns
port: 53
@@ -123,7 +123,7 @@ spec:
# guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it.
limits:
memory: {{ pillar['dns_memory_limit'] }}
memory: 'dns_memory_limit'
requests:
cpu: 100m
memory: 70Mi
@@ -146,7 +146,7 @@ spec:
initialDelaySeconds: 3
timeoutSeconds: 5
args:
- --domain={{ pillar['dns_domain'] }}.
- --domain=dns_domain.
- --dns-port=10053
- --config-dir=/kube-dns-config
- --v=2
@@ -193,7 +193,7 @@ spec:
- --no-negcache
- --dns-loop-detect
- --log-facility=-
- --server=/{{ pillar['dns_domain'] }}/127.0.0.1#10053
- --server=/dns_domain/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053
ports:
@@ -232,8 +232,8 @@ spec:
args:
- --v=2
- --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV
ports:
- containerPort: 10054
name: metrics

8
cluster/addons/dns/kube-dns/transforms2salt.sed
View File

@@ -1,5 +1,5 @@
s/__PILLAR__DNS__SERVER__/{{ pillar['dns_server'] }}/g
s/__PILLAR__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
s/__PILLAR__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
s/__PILLAR__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
s/__DNS__SERVER__/{{ pillar['dns_server'] }}/g
s/__DNS__DOMAIN__/{{ pillar['dns_domain'] }}/g
s/__CLUSTER_CIDR__/{{ pillar['service_cluster_ip_range'] }}/g
s/__DNS__MEMORY__LIMIT__/{{ pillar['dns_memory_limit'] }}/g
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g

8
cluster/addons/dns/kube-dns/transforms2sed.sed
View File

@@ -1,5 +1,5 @@
s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
s/__PILLAR__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
s/__PILLAR__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
s/__DNS__SERVER__/$DNS_SERVER_IP/g
s/__DNS__DOMAIN__/$DNS_DOMAIN/g
s/__CLUSTER_CIDR__/$SERVICE_CLUSTER_IP_RANGE/g
s/__DNS__MEMORY__LIMIT__/$DNS_MEMORY_LIMIT/g
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g