mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 10:19:50 +00:00
Merge pull request #39958 from justinsb/dnsprovider_parent
Automatic merge from submit-queue (batch tested with PRs 39373, 41585, 41617, 41707, 39958) dnsprovider: Expose parent objects in interfaces This will allow us to pass e.g. a ResourceRecordChangeset, rather than a ResourceRecordChangeset, the parent ResourceRecordSets, and the grandparent Zone. Laying the groundwork for simplifying / optimizing the federation logic. ```release-note NONE ```
This commit is contained in:
commit
00b02117bc
@ -59,6 +59,8 @@ type ResourceRecordSets interface {
|
||||
New(name string, rrdatas []string, ttl int64, rrstype rrstype.RrsType) ResourceRecordSet
|
||||
// StartChangeset begins a new batch operation of changes against the Zone
|
||||
StartChangeset() ResourceRecordChangeset
|
||||
// Zone returns the parent zone
|
||||
Zone() Zone
|
||||
}
|
||||
|
||||
// ResourceRecordChangeset accumulates a set of changes, that can then be applied with Apply
|
||||
@ -76,6 +78,8 @@ type ResourceRecordChangeset interface {
|
||||
Apply() error
|
||||
// IsEmpty returns true if there are no accumulated operations.
|
||||
IsEmpty() bool
|
||||
// ResourceRecordSets returns the parent ResourceRecordSets
|
||||
ResourceRecordSets() ResourceRecordSets
|
||||
}
|
||||
|
||||
type ResourceRecordSet interface {
|
||||
|
@ -114,3 +114,8 @@ func (c *ResourceRecordChangeset) Apply() error {
|
||||
func (c *ResourceRecordChangeset) IsEmpty() bool {
|
||||
return len(c.removals) == 0 && len(c.additions) == 0
|
||||
}
|
||||
|
||||
// ResourceRecordSets returns the parent ResourceRecordSets
|
||||
func (c *ResourceRecordChangeset) ResourceRecordSets() dnsprovider.ResourceRecordSets {
|
||||
return c.rrsets
|
||||
}
|
||||
|
@ -88,3 +88,8 @@ func (r ResourceRecordSets) New(name string, rrdatas []string, ttl int64, rrstyp
|
||||
&r,
|
||||
}
|
||||
}
|
||||
|
||||
// Zone returns the parent zone
|
||||
func (rrset ResourceRecordSets) Zone() dnsprovider.Zone {
|
||||
return rrset.zone
|
||||
}
|
||||
|
@ -124,6 +124,11 @@ func (c *ResourceRecordChangeset) Apply() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// ResourceRecordSets returns the parent ResourceRecordSets
|
||||
func (c *ResourceRecordChangeset) ResourceRecordSets() dnsprovider.ResourceRecordSets {
|
||||
return c.rrsets
|
||||
}
|
||||
|
||||
func getHash(text string) string {
|
||||
h := fnv.New32a()
|
||||
h.Write([]byte(text))
|
||||
|
@ -104,6 +104,11 @@ func (rrsets ResourceRecordSets) New(name string, rrdatas []string, ttl int64, r
|
||||
}
|
||||
}
|
||||
|
||||
// Zone returns the parent zone
|
||||
func (rrset ResourceRecordSets) Zone() dnsprovider.Zone {
|
||||
return rrset.zone
|
||||
}
|
||||
|
||||
func emptyResponse(resp *etcdc.Response) bool {
|
||||
return resp == nil || resp.Node == nil || (len(resp.Node.Value) == 0 && len(resp.Node.Nodes) == 0)
|
||||
}
|
||||
|
@ -117,3 +117,8 @@ func (c *ResourceRecordChangeset) Apply() error {
|
||||
func (c *ResourceRecordChangeset) IsEmpty() bool {
|
||||
return len(c.additions) == 0 && len(c.removals) == 0
|
||||
}
|
||||
|
||||
// ResourceRecordSets returns the parent ResourceRecordSets
|
||||
func (c *ResourceRecordChangeset) ResourceRecordSets() dnsprovider.ResourceRecordSets {
|
||||
return c.rrsets
|
||||
}
|
||||
|
@ -70,3 +70,8 @@ func (r ResourceRecordSets) New(name string, rrdatas []string, ttl int64, rrstyp
|
||||
func (rrsets ResourceRecordSets) project() string {
|
||||
return rrsets.zone.project()
|
||||
}
|
||||
|
||||
// Zone returns the parent zone
|
||||
func (rrset ResourceRecordSets) Zone() dnsprovider.Zone {
|
||||
return rrset.zone
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user