Skip to content

Commit

Permalink
Merge pull request kubernetes#28026 from quinton-hoole/2016-06-24-fix…
Browse files Browse the repository at this point in the history
…-nits-in-dns-deletion-logic-fix

Automatic merge from submit-queue

Address outstanding review comments in kubernetes#27999.
(cherry picked from commit 9b215a3)
  • Loading branch information
k8s-merge-robot authored and eparis committed Jun 29, 2016
1 parent 4a0da21 commit fb1ee58
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion federation/pkg/federation-controller/service/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ func (s *ServiceController) ensureDnsRrsets(dnsZoneName, dnsName string, endpoin
if uplevelCname != "" {
glog.V(4).Infof("Creating CNAME to %q for %q", uplevelCname, dnsName)
newRrset := rrsets.New(dnsName, []string{uplevelCname}, minDnsTtl, rrstype.CNAME)
glog.V(4).Infof("Adding recordset %v", newRrset)
rrset, err = rrsets.Add(newRrset)
if err != nil {
return err
Expand Down Expand Up @@ -199,7 +200,7 @@ func (s *ServiceController) ensureDnsRrsets(dnsZoneName, dnsName string, endpoin
}
} else {
// the rrset already exists, so make it right.
glog.V(4).Infof("Recordset %v already exists. Ensuring that it is correct.")
glog.V(4).Infof("Recordset %v already exists. Ensuring that it is correct.", rrset)
if len(endpoints) < 1 {
// Need an appropriate CNAME record. Check that we have it.
newRrset := rrsets.New(dnsName, []string{uplevelCname}, minDnsTtl, rrstype.CNAME)
Expand Down

0 comments on commit fb1ee58

Please sign in to comment.