github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 07:03:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32018 from MrHohn/kubedns-deployment

Browse Source 
Automatic merge from submit-queue

Use a Deployment for kube-dns

Attempt to fix #31554 

Switching kube-dns from using Replication Controller to Deployment.

The outdated kube-dns YAML file in coreos and juju dir is also updated. Most of the specific memory limit in the files remain unchanged because it seems like people were modifying it explicitly(c8d82fc2a9). Only the memory limit for healthz is increased due to this pending investigation(#29688).

YAML files stay in *-rc.yaml format considering there are a lots of scripts in cluster and hack dirs are using this format. But it may be fine to changed them all.

@bprashanth @girishkalele
This commit is contained in:
Kubernetes Submit Queue
2016-09-10 19:16:03 -07:00
committed by GitHub
parent f27f607c09 b5c17fa3cd
commit fdd3cf89a2
5 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/addons/dns/skydns-rc.yaml.base
View File

@@ -12,14 +12,12 @@
# See the License for the specific language governing permissions and
# 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.*
# __MACHINE_GENERATED_WARNING__
apiVersion: v1
kind: ReplicationController
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -30,8 +28,9 @@ metadata:
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
k8s-app: kube-dns
version: v19
matchLabels:
k8s-app: kube-dns
version: v19
template:
metadata:
labels:

11
cluster/addons/dns/skydns-rc.yaml.in
View File

@@ -12,14 +12,12 @@
# See the License for the specific language governing permissions and
# 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.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: v1
kind: ReplicationController
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -30,8 +28,9 @@ metadata:
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v19
matchLabels:
k8s-app: kube-dns
version: v19
template:
metadata:
labels:

11
cluster/addons/dns/skydns-rc.yaml.sed
View File

@@ -12,14 +12,12 @@
# See the License for the specific language governing permissions and
# 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.*
# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
apiVersion: v1
kind: ReplicationController
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: kube-dns-v19
namespace: kube-system
@@ -30,8 +28,9 @@ metadata:
spec:
replicas: $DNS_REPLICAS
selector:
k8s-app: kube-dns
version: v19
matchLabels:
k8s-app: kube-dns
version: v19
template:
metadata:
labels: