Skip to content

Commit 7c946d7

Browse files
committed
fix: Fix SRV record to point to A record
1 parent 120f9b0 commit 7c946d7

1 file changed

Lines changed: 9 additions & 18 deletions

File tree

‎controller/internal/provider/google/google.go‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package google
22

33
import (
44
"context"
5-
"fmt"
65
"net/http"
76

87
agonesv1 "agones.dev/agones/pkg/apis/agones/v1"
@@ -31,10 +30,7 @@ func (c *GoogleDnsClient) SetExternalDns(hostname string, gs *agonesv1.GameServe
3130
change := dns.Change{}
3231

3332
aRecord := NewARecordSet(hostname, gs, DefaultTtl)
34-
srvRecord, err := NewSrvRecordSet(hostname, gs, DefaultTtl)
35-
if err != nil {
36-
return provider.ServerResponse{}, err
37-
}
33+
srvRecord := NewSrvRecordSet(hostname, gs, DefaultTtl)
3834

3935
change.Additions = []*dns.ResourceRecordSet{aRecord, srvRecord}
4036
res, err := c.Changes.Create(c.config.GoogleProjectId, c.config.GoogleManagedZone, &change).Do()
@@ -63,10 +59,7 @@ func (c *GoogleDnsClient) RemoveExternalDns(hostname string, gs *agonesv1.GameSe
6359
change := dns.Change{}
6460

6561
aRecord := NewARecordSet(hostname, gs, DefaultTtl)
66-
srvRecord, err := NewSrvRecordSet(hostname, gs, DefaultTtl)
67-
if err != nil {
68-
return provider.ServerResponse{}, err
69-
}
62+
srvRecord := NewSrvRecordSet(hostname, gs, DefaultTtl)
7063

7164
change.Deletions = []*dns.ResourceRecordSet{srvRecord, aRecord}
7265
res, err := c.Changes.Create(c.config.GoogleProjectId, c.config.GoogleManagedZone, &change).Do()
@@ -84,18 +77,16 @@ func (c *GoogleDnsClient) RemoveExternalDns(hostname string, gs *agonesv1.GameSe
8477
return provider.ServerResponse{HTTPStatusCode: res.HTTPStatusCode, Header: res.Header}, nil
8578
}
8679

87-
func NewSrvRecordSet(hostname string, gs *agonesv1.GameServer, ttl int64) (*dns.ResourceRecordSet, error) {
88-
ports := gs.Status.Ports
89-
90-
if ports == nil {
91-
return nil, fmt.Errorf("server ports not allocated")
92-
}
80+
func NewSrvRecordSet(hostname string, gs *agonesv1.GameServer, ttl int64) *dns.ResourceRecordSet {
9381

9482
port := gs.Status.Ports[0].Port
95-
recordName := mcDns.JoinSrvRecordName(hostname, gs.Name)
96-
resourceRecord := mcDns.JoinSrvRR(recordName, uint16(port), DefaultPriority, DefaultWeight)
9783

98-
return &dns.ResourceRecordSet{Type: SRV, Name: recordName, Rrdatas: []string{resourceRecord}, Ttl: ttl}, nil
84+
srvRecordName := mcDns.JoinSrvRecordName(hostname, gs.Name)
85+
aRecordName := mcDns.JoinARecordName(hostname, gs.Name)
86+
87+
resourceRecord := mcDns.JoinSrvRR(aRecordName, uint16(port), DefaultPriority, DefaultWeight)
88+
89+
return &dns.ResourceRecordSet{Type: SRV, Name: srvRecordName, Rrdatas: []string{resourceRecord}, Ttl: ttl}
9990
}
10091

10192
func NewARecordSet(hostname string, gs *agonesv1.GameServer, ttl int64) *dns.ResourceRecordSet {

0 commit comments

Comments
 (0)