kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3398 from justinsb/gce_dont_remove_shared_dns_zone 

Automatic merge from submit-queue. .

GCE: Don't remove (shared) DNS Zone
This commit is contained in:
Kubernetes Submit Queue 2017-09-22 17:19:42 -07:00 committed by GitHub
parent 0683db2ea3 8ff312397b
commit 14263de04a
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/resources/gce.go
View File

@ -25,7 +25,6 @@ import (
compute "google.golang.org/api/compute/v0.beta" compute "google.golang.org/api/compute/v0.beta"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kops/pkg/dns"
"k8s.io/kops/pkg/resources/tracker" "k8s.io/kops/pkg/resources/tracker"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/upup/pkg/fi/cloudup/gce"
@ -735,24 +734,26 @@ func (d *clusterDiscoveryGCE) matchesClusterName(name string) bool {
} }
func (d *clusterDiscoveryGCE) listGCEDNSZone() ([]*tracker.Resource, error) { func (d *clusterDiscoveryGCE) listGCEDNSZone() ([]*tracker.Resource, error) {
if dns.IsGossipHostname(d.clusterName) { // We never delete the hosted zone, because it is usually shared and we don't create it
return nil, nil return nil, nil
} // TODO: When shared resource PR lands, reintroduce
//if dns.IsGossipHostname(d.clusterName) {
zone, err := d.findDNSZone() // return nil, nil
if err != nil { //}
return nil, err //zone, err := d.findDNSZone()
} //if err != nil {
// return nil, err
return []*tracker.Resource{ //}
{ //
Name: zone.Name(), //return []*tracker.Resource{
ID: zone.Name(), // {
Type: "DNS Zone", // Name: zone.Name(),
Deleter: d.deleteDNSZone, // ID: zone.Name(),
Obj: zone, // Type: "DNS Zone",
}, // Deleter: d.deleteDNSZone,
}, nil // Obj: zone,
// },
//}, nil
} }
func (d *clusterDiscoveryGCE) findDNSZone() (dnsprovider.Zone, error) { func (d *clusterDiscoveryGCE) findDNSZone() (dnsprovider.Zone, error) {