github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-26 12:02:34 +00:00
Code Issues Projects Releases Wiki Activity

Code review comments and corrections

Browse Source
This commit is contained in:
Girish Kalele 2016-05-31 11:33:51 -07:00
parent 60d2293f4c
commit 555b9000c3
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# __MACHINE_GENERATED_WARNING__ # __MACHINE_GENERATED_WARNING__
apiVersion: v1 apiVersion: v1
@ -71,7 +73,7 @@ spec:
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns" # command = "/kube-dns"
- --domain=__PILLAR__DNS__DOMAIN__ - --domain=__PILLAR__DNS__DOMAIN__.
- --dns-port=10053 - --dns-port=10053
ports: ports:
- containerPort: 10053 - containerPort: 10053

4
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: v1 apiVersion: v1
@ -71,7 +73,7 @@ spec:
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns" # command = "/kube-dns"
- --domain={{ pillar['dns_domain'] }} - --domain={{ pillar['dns_domain'] }}.
- --dns-port=10053 - --dns-port=10053
ports: ports:
- containerPort: 10053 - containerPort: 10053

4
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: v1 apiVersion: v1
@ -71,7 +73,7 @@ spec:
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
# command = "/kube-dns" # command = "/kube-dns"
- --domain=$DNS_DOMAIN}} - --domain=$DNS_DOMAIN}}.
- --dns-port=10053 - --dns-port=10053
ports: ports:
- containerPort: 10053 - containerPort: 10053

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# __MACHINE_GENERATED_WARNING__ # __MACHINE_GENERATED_WARNING__
apiVersion: v1 apiVersion: v1

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
apiVersion: v1 apiVersion: v1

2
cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed
View File

@ -14,6 +14,8 @@
# This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
apiVersion: v1 apiVersion: v1