Skip to content

K
k3s
Commit dce1c06a authored by Zihong Zheng's avatar Zihong Zheng Committed by GitHub
Browse files
Options

Revert "Use a Deployment for kube-dns"

parent b73aa599
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 54 deletions
cluster/addons/dns/skydns-rc.yaml.base
View file @ dce1c06a
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# 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.* # TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
# __MACHINE_GENERATED_WARNING__ # __MACHINE_GENERATED_WARNING__
apiVersion: extensions/v1beta1 apiVersion: v1
kind: Deployment kind: ReplicationController
metadata: metadata:
name: kube-dns-v19 name: kube-dns-v19
namespace: kube-system namespace: kube-system
...@@ -28,9 +30,8 @@ metadata: ...@@ -28,9 +30,8 @@ metadata:
spec: spec:
replicas: __PILLAR__DNS__REPLICAS__ replicas: __PILLAR__DNS__REPLICAS__
selector: selector:
matchLabels: k8s-app: kube-dns
k8s-app: kube-dns version: v19
version: v19
template: template:
metadata: metadata:
labels: labels:
......
cluster/addons/dns/skydns-rc.yaml.in
View file @ dce1c06a
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# 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.* # 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: extensions/v1beta1 apiVersion: v1
kind: Deployment kind: ReplicationController
metadata: metadata:
name: kube-dns-v19 name: kube-dns-v19
namespace: kube-system namespace: kube-system
...@@ -28,9 +30,8 @@ metadata: ...@@ -28,9 +30,8 @@ metadata:
spec: spec:
replicas: {{ pillar['dns_replicas'] }} replicas: {{ pillar['dns_replicas'] }}
selector: selector:
matchLabels: k8s-app: kube-dns
k8s-app: kube-dns version: v19
version: v19
template: template:
metadata: metadata:
labels: labels:
......
cluster/addons/dns/skydns-rc.yaml.sed
View file @ dce1c06a
...@@ -12,12 +12,14 @@ ...@@ -12,12 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# 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.* # 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: extensions/v1beta1 apiVersion: v1
kind: Deployment kind: ReplicationController
metadata: metadata:
name: kube-dns-v19 name: kube-dns-v19
namespace: kube-system namespace: kube-system
...@@ -28,9 +30,8 @@ metadata: ...@@ -28,9 +30,8 @@ metadata:
spec: spec:
replicas: $DNS_REPLICAS replicas: $DNS_REPLICAS
selector: selector:
matchLabels: k8s-app: kube-dns
k8s-app: kube-dns version: v19
version: v19
template: template:
metadata: metadata:
labels: labels:
......
cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml
View file @ dce1c06a
apiVersion: extensions/v1beta1 apiVersion: v1
kind: Deployment kind: ReplicationController
metadata: metadata:
name: kube-dns-v19 name: kube-dns-v15
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v19 version: v15
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: ${DNS_REPLICAS} replicas: ${DNS_REPLICAS}
selector: selector:
matchLabels: k8s-app: kube-dns
k8s-app: kube-dns version: v15
version: v19
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v19 version: v15
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
...@@ -67,7 +63,7 @@ spec: ...@@ -67,7 +63,7 @@ spec:
name: dns-tcp-local name: dns-tcp-local
protocol: TCP protocol: TCP
- name: dnsmasq - name: dnsmasq
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3 image: gcr.io/google_containers/dnsmasq:1.1
args: args:
- --cache-size=1000 - --cache-size=1000
- --no-resolv - --no-resolv
...@@ -80,23 +76,18 @@ spec: ...@@ -80,23 +76,18 @@ spec:
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-amd64:1.1 image: gcr.io/google_containers/exechealthz-amd64:1.0
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 10m cpu: 10m
memory: 50Mi memory: 20Mi
requests: requests:
cpu: 10m cpu: 10m
# Note that this container shouldn't really need 50Mi of memory. The memory: 20Mi
# limits are set higher than expected pending investigation on #29688.
# The extra memory was stolen from the kubedns container to keep the
# net memory requested by the pod constant.
memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1:10053 >/dev/null - -cmd=nslookup kubernetes.default.svc.${DNS_DOMAIN} 127.0.0.1 >/dev/null
- -port=8080 - -port=8080
- -quiet
ports: ports:
- containerPort: 8080 - containerPort: 8080
protocol: TCP protocol: TCP
......
cluster/juju/layers/kubernetes/templates/kubedns-rc.yaml
View file @ dce1c06a
...@@ -12,32 +12,30 @@ ...@@ -12,32 +12,30 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This file should be kept in sync with cluster/images/hyperkube/dns-rc.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: extensions/v1beta1 apiVersion: v1
kind: Deployment kind: ReplicationController
metadata: metadata:
name: kube-dns-v19 name: kube-dns-v18
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v19 version: v18
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: {{ pillar['dns_replicas'] }} replicas: {{ pillar['dns_replicas'] }}
selector: selector:
matchLabels: k8s-app: kube-dns
k8s-app: kube-dns version: v18
version: v19
template: template:
metadata: metadata:
labels: labels:
k8s-app: kube-dns k8s-app: kube-dns
version: v19 version: v18
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
spec: spec:
containers: containers:
- name: kubedns - name: kubedns
...@@ -98,19 +96,15 @@ spec: ...@@ -98,19 +96,15 @@ spec:
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- name: healthz - name: healthz
image: gcr.io/google_containers/exechealthz-{{ arch }}:1.1 image: gcr.io/google_containers/exechealthz-{{ arch }}:1.0
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:
cpu: 10m cpu: 10m
memory: 50Mi memory: 20Mi
requests: requests:
cpu: 10m cpu: 10m
# Note that this container shouldn't really need 50Mi of memory. The memory: 20Mi
# limits are set higher than expected pending investigation on #29688.
# The extra memory was stolen from the kubedns container to keep the
# net memory requested by the pod constant.
memory: 50Mi
args: args:
- -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null - -cmd=nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.{{ pillar['dns_domain'] }} 127.0.0.1:10053 >/dev/null
- -port=8080 - -port=8080
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment