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

Fixed kubedns e2e test fail,change k8s-app name to kube-dns

Browse source
This commit is contained in:
billy2180 2017-06-08 12:01:57 +08:00
parent ef3c2d86d3
commit 81f7fc4595
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml
View file

@ -4,19 +4,19 @@ metadata:
name: kubedns name: kubedns
namespace: {{ system_namespace }} namespace: {{ system_namespace }}
labels: labels:
k8s-app: kubedns k8s-app: kube-dns
version: v19 version: v19
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
replicas: {{ kubedns_min_replicas }} replicas: {{ kubedns_min_replicas }}
selector: selector:
matchLabels: matchLabels:
k8s-app: kubedns k8s-app: kube-dns
version: v19 version: v19
template: template:
metadata: metadata:
labels: labels:
k8s-app: kubedns k8s-app: kube-dns
version: v19 version: v19
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:

4
roles/kubernetes-apps/ansible/templates/kubedns-svc.yml
View file

@ -4,12 +4,12 @@ metadata:
name: kubedns name: kubedns
namespace: {{ system_namespace }} namespace: {{ system_namespace }}
labels: labels:
k8s-app: kubedns k8s-app: kube-dns
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
kubernetes.io/name: "kubedns" kubernetes.io/name: "kubedns"
spec: spec:
selector: selector:
k8s-app: kubedns k8s-app: kube-dns
clusterIP: {{ skydns_server }} clusterIP: {{ skydns_server }}
ports: ports:
- name: dns - name: dns