Browse Source

Move most coredns templates to static files (#4341)

* Move most coredns templates to static files

This should speed up the task slightly

* yaml lint fixes
pull/4344/head
Matthew Mosesohn 5 years ago
committed by Kubernetes Prow Robot
parent
commit
fd2c47b56a
8 changed files with 43 additions and 42 deletions
  1. 0
      roles/kubernetes-apps/ansible/dns-autoscaler-clusterrole.yml
  2. 0
      roles/kubernetes-apps/ansible/dns-autoscaler-clusterrolebinding.yml
  3. 25
      roles/kubernetes-apps/ansible/files/coredns-clusterrole.yml
  4. 6
      roles/kubernetes-apps/ansible/files/coredns-clusterrolebinding.yml
  5. 4
      roles/kubernetes-apps/ansible/files/coredns-sa.yml
  6. 0
      roles/kubernetes-apps/ansible/files/dns-autoscaler-sa.yml
  7. 25
      roles/kubernetes-apps/ansible/tasks/coredns.yml
  8. 25
      roles/kubernetes-apps/ansible/templates/coredns-clusterrole.yml.j2

roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrole.yml.j2 → roles/kubernetes-apps/ansible/dns-autoscaler-clusterrole.yml

roles/kubernetes-apps/ansible/templates/dns-autoscaler-clusterrolebinding.yml.j2 → roles/kubernetes-apps/ansible/dns-autoscaler-clusterrolebinding.yml

25
roles/kubernetes-apps/ansible/files/coredns-clusterrole.yml

@ -0,0 +1,25 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
kubernetes.io/bootstrapping: rbac-defaults
addonmanager.kubernetes.io/mode: Reconcile
name: system:coredns
rules:
- apiGroups:
- ""
resources:
- endpoints
- services
- pods
- namespaces
verbs:
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get

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

@ -13,6 +13,6 @@ roleRef:
kind: ClusterRole
name: system:coredns
subjects:
- kind: ServiceAccount
name: coredns
namespace: kube-system
- kind: ServiceAccount
name: coredns
namespace: kube-system

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

@ -5,5 +5,5 @@ metadata:
name: coredns
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile

roles/kubernetes-apps/ansible/templates/dns-autoscaler-sa.yml.j2 → roles/kubernetes-apps/ansible/files/dns-autoscaler-sa.yml

25
roles/kubernetes-apps/ansible/tasks/coredns.yml

@ -1,19 +1,20 @@
---
- name: Kubernetes Apps | Lay Down CoreDNS Template
template:
src: "{{ item.file }}.j2"
action: "{{ item.module }}"
args:
src: "{{ item.file }}{% if item.module == 'template' %}.j2{% endif %}"
dest: "{{ kube_config_dir }}/{{ item.file }}"
with_items:
- { name: coredns, file: coredns-config.yml, type: configmap }
- { name: coredns, file: coredns-sa.yml, type: sa }
- { name: coredns, file: coredns-deployment.yml, type: deployment }
- { name: coredns, file: coredns-svc.yml, type: svc }
- { name: coredns, file: coredns-clusterrole.yml, type: clusterrole }
- { name: coredns, file: coredns-clusterrolebinding.yml, type: clusterrolebinding }
- { name: dns-autoscaler, file: dns-autoscaler-sa.yml, type: sa }
- { name: dns-autoscaler, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
- { name: dns-autoscaler, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
- { name: dns-autoscaler, file: dns-autoscaler.yml, type: deployment }
- { name: coredns, module: template, file: coredns-config.yml, type: configmap }
- { name: coredns, module: copy, file: coredns-sa.yml, type: sa }
- { name: coredns, module: template, file: coredns-deployment.yml, type: deployment }
- { name: coredns, module: template, file: coredns-svc.yml, type: svc }
- { name: coredns, module: copy, file: coredns-clusterrole.yml, type: clusterrole }
- { name: coredns, module: copy, file: coredns-clusterrolebinding.yml, type: clusterrolebinding }
- { name: dns-autoscaler, module: copy, file: dns-autoscaler-sa.yml, type: sa }
- { name: dns-autoscaler, module: copy, file: dns-autoscaler-clusterrole.yml, type: clusterrole }
- { name: dns-autoscaler, module: copy, file: dns-autoscaler-clusterrolebinding.yml, type: clusterrolebinding }
- { name: dns-autoscaler, module: template, file: dns-autoscaler.yml, type: deployment }
register: coredns_manifests
vars:
clusterIP: "{{ skydns_server }}"

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

@ -1,25 +0,0 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
kubernetes.io/bootstrapping: rbac-defaults
addonmanager.kubernetes.io/mode: Reconcile
name: system:coredns
rules:
- apiGroups:
- ""
resources:
- endpoints
- services
- pods
- namespaces
verbs:
- list
- watch
- apiGroups:
- ""
resources:
- nodes
verbs:
- get
Loading…
Cancel
Save