From 6caa639243bf217bdb4e5925d4da868ca1d1b6ef Mon Sep 17 00:00:00 2001
From: Sidharth Anupkrishnan <sanupkri@redhat.com>
Date: Wed, 10 Apr 2019 16:42:13 +0530
Subject: [PATCH] Update CoreDNS label as specified in the kubernetes coredns
repository (#3920)
---
.../ansible/templates/coredns-deployment.yml.j2 | 8 ++++----
.../kubernetes-apps/ansible/templates/coredns-svc.yml.j2 | 5 ++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
index 5a1edb8ae..fd7bfc9fa 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
@@ -5,7 +5,7 @@ metadata:
name: "coredns{{ coredns_ordinal_suffix }}"
namespace: kube-system
labels:
- k8s-app: "coredns{{ coredns_ordinal_suffix }}"
+ k8s-app: "kube-dns{{ coredns_ordinal_suffix }}"
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
@@ -17,11 +17,11 @@ spec:
maxSurge: 10%
selector:
matchLabels:
- k8s-app: coredns{{ coredns_ordinal_suffix }}
+ k8s-app: kube-dns{{ coredns_ordinal_suffix }}
template:
metadata:
labels:
- k8s-app: coredns{{ coredns_ordinal_suffix }}
+ k8s-app: kube-dns{{ coredns_ordinal_suffix }}
annotations:
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
spec:
@@ -40,7 +40,7 @@ spec:
- topologyKey: "kubernetes.io/hostname"
labelSelector:
matchLabels:
- k8s-app: coredns{{ coredns_ordinal_suffix }}
+ k8s-app: kube-dns{{ coredns_ordinal_suffix }}
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
diff --git a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2 b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
index a12711d66..5f7f6d09b 100644
--- a/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/coredns-svc.yml.j2
@@ -5,17 +5,16 @@ metadata:
name: coredns{{ coredns_ordinal_suffix }}
namespace: kube-system
labels:
- k8s-app: coredns{{ coredns_ordinal_suffix }}
+ k8s-app: kube-dns{{ coredns_ordinal_suffix }}
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "coredns{{ coredns_ordinal_suffix }}"
addonmanager.kubernetes.io/mode: Reconcile
annotations:
- prometheus.io/path: /metrics
prometheus.io/port: "9153"
prometheus.io/scrape: "true"
spec:
selector:
- k8s-app: coredns{{ coredns_ordinal_suffix }}
+ k8s-app: kube-dns{{ coredns_ordinal_suffix }}
clusterIP: {{ clusterIP }}
ports:
- name: dns
--
GitLab