github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27708 from nikhiljindal/dnsHealthCheck

Browse Source 
Automatic merge from submit-queue

federation: Updating KubeDNS to try finding a local service first for federation query

Ref https://github.com/kubernetes/kubernetes/issues/26762

Updating KubeDNS to try to find a local service first for federation query.
Without this change, KubeDNS always returns the DNS hostname, even if a local service exists.

Have updated the code to first remove federation name from path if it exists, so that the default search for local service happens. If we dont find a local service, then we try to find the DNS hostname.

Will appreciate a strong review since this is my first change to KubeDNS.
https://github.com/kubernetes/kubernetes/pull/25727 was the original PR that added federation support to KubeDNS.

cc @kubernetes/sig-cluster-federation @quinton-hoole @madhusudancs @bprashanth @mml
This commit is contained in:
k8s-merge-robot
2016-06-23 20:30:58 -07:00
committed by GitHub
parent 038c120423 7be429307b
commit a27fd4b01e
9 changed files with 278 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v16
name: kube-dns-v17
namespace: kube-system
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
k8s-app: kube-dns
version: v16
version: v17
template:
metadata:
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.4
image: gcr.io/google_containers/kubedns-amd64:1.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v16
name: kube-dns-v17
namespace: kube-system
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v16
version: v17
template:
metadata:
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.4
image: gcr.io/google_containers/kubedns-amd64:1.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v16
name: kube-dns-v17
namespace: kube-system
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
replicas: $DNS_REPLICAS
selector:
k8s-app: kube-dns
version: v16
version: v17
template:
metadata:
labels:
k8s-app: kube-dns
version: v16
version: v17
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.4
image: gcr.io/google_containers/kubedns-amd64:1.5
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in