External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-24 09:07:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Reduce jinja2 filters in coredns templates (#4390)

Browse Source
This commit is contained in:
Matthew Mosesohn
2019-03-26 21:09:17 +03:00
committed by Kubernetes Prow Robot
parent 85e0fb32e6
commit 6d7f3c4405
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View File

@@ -2,13 +2,13 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: "coredns{{ coredns_ordinal_suffix | default('') }}"
name: "coredns{{ coredns_ordinal_suffix }}"
namespace: kube-system
labels:
k8s-app: "coredns{{ coredns_ordinal_suffix | default('') }}"
k8s-app: "coredns{{ coredns_ordinal_suffix }}"
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix | default('') }}"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
spec:
strategy:
type: RollingUpdate
@@ -17,17 +17,15 @@ spec:
maxSurge: 10%
selector:
matchLabels:
k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
k8s-app: coredns{{ coredns_ordinal_suffix }}
template:
metadata:
labels:
k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
k8s-app: coredns{{ coredns_ordinal_suffix }}
annotations:
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
spec:
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-cluster-critical
{% endif %}
nodeSelector:
beta.kubernetes.io/os: linux
serviceAccountName: coredns
@@ -42,7 +40,7 @@ spec:
- topologyKey: "kubernetes.io/hostname"
labelSelector:
matchLabels:
k8s-app: coredns{{ coredns_ordinal_suffix | default('') }}
k8s-app: coredns{{ coredns_ordinal_suffix }}
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100