C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update CoreDNS label as specified in the kubernetes coredns repository (#3920)

Browse source
This commit is contained in:
Sidharth Anupkrishnan 2019-04-10 16:42:13 +05:30 committed by Kubernetes Prow Robot
parent 80f31818df
commit 6caa639243
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View file

@ -5,7 +5,7 @@ metadata:
name: "coredns{{ coredns_ordinal_suffix }}" name: "coredns{{ coredns_ordinal_suffix }}"
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: "coredns{{ coredns_ordinal_suffix }}" k8s-app: "kube-dns{{ coredns_ordinal_suffix }}"
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}" kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
@ -17,11 +17,11 @@ spec:
maxSurge: 10% maxSurge: 10%
selector: selector:
matchLabels: matchLabels:
k8s-app: coredns{{ coredns_ordinal_suffix }} k8s-app: kube-dns{{ coredns_ordinal_suffix }}
template: template:
metadata: metadata:
labels: labels:
k8s-app: coredns{{ coredns_ordinal_suffix }} k8s-app: kube-dns{{ coredns_ordinal_suffix }}
annotations: annotations:
seccomp.security.alpha.kubernetes.io/pod: 'docker/default' seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
spec: spec:
@ -40,7 +40,7 @@ spec:
- topologyKey: "kubernetes.io/hostname" - topologyKey: "kubernetes.io/hostname"
labelSelector: labelSelector:
matchLabels: matchLabels:
k8s-app: coredns{{ coredns_ordinal_suffix }} k8s-app: kube-dns{{ coredns_ordinal_suffix }}
nodeAffinity: nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution: preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100 - weight: 100

5
roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
View file

@ -5,17 +5,16 @@ metadata:
name: coredns{{ coredns_ordinal_suffix }} name: coredns{{ coredns_ordinal_suffix }}
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: coredns{{ coredns_ordinal_suffix }} k8s-app: kube-dns{{ coredns_ordinal_suffix }}
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}" kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
annotations: annotations:
prometheus.io/path: /metrics
prometheus.io/port: "9153" prometheus.io/port: "9153"
prometheus.io/scrape: "true" prometheus.io/scrape: "true"
spec: spec:
selector: selector:
k8s-app: coredns{{ coredns_ordinal_suffix }} k8s-app: kube-dns{{ coredns_ordinal_suffix }}
clusterIP: {{ clusterIP }} clusterIP: {{ clusterIP }}
ports: ports:
- name: dns - name: dns