Browse Source

Update CoreDNS templates to newest version and fix kubedns-autoscaler (#3483)

* Update CoreDNS templates to newest version

* Add watch to ClusterRole. Fixes #3460
pull/3503/merge
Andreas Krüger 6 years ago
committed by k8s-ci-robot
parent
commit
cdce8c81da
7 changed files with 14 additions and 13 deletions
  1. 1
      roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2
  2. 1
      roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2
  3. 5
      roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2
  4. 12
      roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
  5. 3
      roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2
  6. 3
      roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
  7. 2
      roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2

1
roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2

@ -4,7 +4,6 @@ kind: ClusterRole
metadata:
labels:
kubernetes.io/bootstrapping: rbac-defaults
addonmanager.kubernetes.io/mode: Reconcile
name: system:coredns
rules:
- apiGroups:

1
roles/kubernetes-apps/ansible/templates/coredns-clusterrolebinding.yml.j2

@ -6,7 +6,6 @@ metadata:
rbac.authorization.kubernetes.io/autoupdate: "true"
labels:
kubernetes.io/bootstrapping: rbac-defaults
addonmanager.kubernetes.io/mode: EnsureExists
name: system:coredns
roleRef:
apiGroup: rbac.authorization.k8s.io

5
roles/kubernetes-apps/ansible/templates/coredns-config.yml.j2

@ -4,8 +4,6 @@ kind: ConfigMap
metadata:
name: coredns
namespace: kube-system
labels:
addonmanager.kubernetes.io/mode: EnsureExists
data:
Corefile: |
.:53 {
@ -27,4 +25,7 @@ data:
proxy . /etc/resolv.conf
{% endif %}
cache 30
loop
reload
loadbalance
}

12
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2

@ -6,9 +6,7 @@ metadata:
namespace: kube-system
labels:
k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "CoreDNS"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}"
spec:
replicas: {{ coredns_replicas }}
strategy:
@ -79,6 +77,14 @@ spec:
- containerPort: 9153
name: metrics
protocol: TCP
securityContext:
allowPrivilegeEscalation: false
capabilities:
add:
- NET_BIND_SERVICE
drop:
- all
readOnlyRootFilesystem: true
livenessProbe:
httpGet:
path: /health

3
roles/kubernetes-apps/ansible/templates/coredns-sa.yml.j2

@ -4,6 +4,3 @@ kind: ServiceAccount
metadata:
name: coredns
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile

3
roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2

@ -7,8 +7,7 @@ metadata:
labels:
k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "CoreDNS"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}"
annotations:
prometheus.io/path: /metrics
prometheus.io/port: "9153"

2
roles/kubernetes-apps/ansible/templates/kubedns-autoscaler-clusterrole.yml.j2

@ -21,7 +21,7 @@ metadata:
rules:
- apiGroups: [""]
resources: ["nodes"]
verbs: ["list"]
verbs: ["list", "watch"]
- apiGroups: [""]
resources: ["replicationcontrollers/scale"]
verbs: ["get", "update"]

Loading…
Cancel
Save