From 81f7fc4595fd3f5cc850dffcc03a5d233f75bbb2 Mon Sep 17 00:00:00 2001 From: billy2180 Date: Thu, 8 Jun 2017 12:01:57 +0800 Subject: [PATCH] Fixed kubedns e2e test fail,change k8s-app name to kube-dns --- roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml | 6 +++--- roles/kubernetes-apps/ansible/templates/kubedns-svc.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml index a2150cc70..5946aa035 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml +++ b/roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml @@ -4,19 +4,19 @@ metadata: name: kubedns namespace: {{ system_namespace }} labels: - k8s-app: kubedns + k8s-app: kube-dns version: v19 kubernetes.io/cluster-service: "true" spec: replicas: {{ kubedns_min_replicas }} selector: matchLabels: - k8s-app: kubedns + k8s-app: kube-dns version: v19 template: metadata: labels: - k8s-app: kubedns + k8s-app: kube-dns version: v19 kubernetes.io/cluster-service: "true" spec: diff --git a/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml b/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml index ce8779326..e57a0bc16 100644 --- a/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml +++ b/roles/kubernetes-apps/ansible/templates/kubedns-svc.yml @@ -4,12 +4,12 @@ metadata: name: kubedns namespace: {{ system_namespace }} labels: - k8s-app: kubedns + k8s-app: kube-dns kubernetes.io/cluster-service: "true" kubernetes.io/name: "kubedns" spec: selector: - k8s-app: kubedns + k8s-app: kube-dns clusterIP: {{ skydns_server }} ports: - name: dns