Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementing GCE as an interface - modelling aws cloud provider #3292

Merged
merged 1 commit into from
Aug 28, 2017
Merged

Implementing GCE as an interface - modelling aws cloud provider #3292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kops/status_discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (s *cloudDiscoveryStatusStore) GetApiIngressStatus(cluster *kops.Cluster) (
return nil, err
}

if gceCloud, ok := cloud.(*gce.GCECloud); ok {
if gceCloud, ok := cloud.(gce.GCECloud); ok {
return gceCloud.GetApiIngressStatus(cluster)
}

Expand Down
60 changes: 30 additions & 30 deletions pkg/resources/gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const (
)

func (c *ClusterResources) listResourcesGCE() (map[string]*ResourceTracker, error) {
gceCloud := c.Cloud.(*gce.GCECloud)
gceCloud := c.Cloud.(gce.GCECloud)
if c.Region == "" {
c.Region = gceCloud.Region
c.Region = gceCloud.Region()
}

resources := make(map[string]*ResourceTracker)
Expand All @@ -60,7 +60,7 @@ func (c *ClusterResources) listResourcesGCE() (map[string]*ResourceTracker, erro

{
// TODO: Only zones in api.Cluster object, if we have one?
gceZones, err := d.gceCloud.Compute.Zones.List(d.gceCloud.Project).Do()
gceZones, err := d.gceCloud.Compute().Zones.List(d.gceCloud.Project()).Do()
if err != nil {
return nil, fmt.Errorf("error listing zones: %v", err)
}
Expand Down Expand Up @@ -123,7 +123,7 @@ func (c *ClusterResources) listResourcesGCE() (map[string]*ResourceTracker, erro

type clusterDiscoveryGCE struct {
cloud fi.Cloud
gceCloud *gce.GCECloud
gceCloud gce.GCECloud
clusterName string

instanceTemplates []*compute.InstanceTemplate
Expand All @@ -147,7 +147,7 @@ func (d *clusterDiscoveryGCE) findInstanceTemplates() ([]*compute.InstanceTempla

ctx := context.Background()

err := c.Compute.InstanceTemplates.List(c.Project).Pages(ctx, func(page *compute.InstanceTemplateList) error {
err := c.Compute().InstanceTemplates.List(c.Project()).Pages(ctx, func(page *compute.InstanceTemplateList) error {
for _, t := range page.Items {
match := false
for _, item := range t.Properties.Metadata.Items {
Expand Down Expand Up @@ -202,7 +202,7 @@ func (d *clusterDiscoveryGCE) listGCEInstanceTemplates() ([]*ResourceTracker, er
}

func deleteGCEInstanceTemplate(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.InstanceTemplate)

glog.V(2).Infof("Deleting GCE InstanceTemplate %s", t.SelfLink)
Expand All @@ -211,7 +211,7 @@ func deleteGCEInstanceTemplate(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.InstanceTemplates.Delete(u.Project, u.Name).Do()
op, err := c.Compute().InstanceTemplates.Delete(u.Project, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("instancetemplate not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -225,7 +225,7 @@ func deleteGCEInstanceTemplate(cloud fi.Cloud, r *ResourceTracker) error {

func (d *clusterDiscoveryGCE) listInstanceGroupManagersAndInstances() ([]*ResourceTracker, error) {
c := d.gceCloud
project := c.Project
project := c.Project()

var trackers []*ResourceTracker

Expand All @@ -243,7 +243,7 @@ func (d *clusterDiscoveryGCE) listInstanceGroupManagersAndInstances() ([]*Resour
ctx := context.Background()

for _, zoneName := range d.zones {
err := c.Compute.InstanceGroupManagers.List(project, zoneName).Pages(ctx, func(page *compute.InstanceGroupManagerList) error {
err := c.Compute().InstanceGroupManagers.List(project, zoneName).Pages(ctx, func(page *compute.InstanceGroupManagerList) error {
for _, mig := range page.Items {
instanceTemplate := instanceTemplates[mig.InstanceTemplate]
if instanceTemplate == nil {
Expand Down Expand Up @@ -282,7 +282,7 @@ func (d *clusterDiscoveryGCE) listInstanceGroupManagersAndInstances() ([]*Resour
}

func deleteInstanceGroupManager(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.InstanceGroupManager)

glog.V(2).Infof("Deleting GCE InstanceGroupManager %s", t.SelfLink)
Expand All @@ -293,7 +293,7 @@ func deleteInstanceGroupManager(cloud fi.Cloud, r *ResourceTracker) error {

//glog.Infof("MIG: %s", fi.DebugAsJsonString(t))

op, err := c.Compute.InstanceGroupManagers.Delete(u.Project, u.Zone, u.Name).Do()
op, err := c.Compute().InstanceGroupManagers.Delete(u.Project, u.Zone, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("InstanceGroupManager not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -307,14 +307,14 @@ func deleteInstanceGroupManager(cloud fi.Cloud, r *ResourceTracker) error {

func (d *clusterDiscoveryGCE) listManagedInstances(igm *compute.InstanceGroupManager) ([]*ResourceTracker, error) {
c := d.gceCloud
project := c.Project
project := c.Project()

var trackers []*ResourceTracker

zoneName := gce.LastComponent(igm.Zone)

// This call is not paginated
instances, err := c.Compute.InstanceGroupManagers.ListManagedInstances(project, zoneName, igm.Name).Do()
instances, err := c.Compute().InstanceGroupManagers.ListManagedInstances(project, zoneName, igm.Name).Do()
if err != nil {
return nil, fmt.Errorf("error listing ManagedInstances in %s: %v", igm.Name, err)
}
Expand Down Expand Up @@ -351,7 +351,7 @@ func (d *clusterDiscoveryGCE) findGCEDisks() ([]*compute.Disk, error) {

// TODO: Push down tag filter?

err := c.Compute.Disks.AggregatedList(c.Project).Pages(ctx, func(page *compute.DiskAggregatedList) error {
err := c.Compute().Disks.AggregatedList(c.Project()).Pages(ctx, func(page *compute.DiskAggregatedList) error {
for _, list := range page.Items {
for _, d := range list.Disks {
match := false
Expand Down Expand Up @@ -411,7 +411,7 @@ func (d *clusterDiscoveryGCE) listGCEDisks() ([]*ResourceTracker, error) {
}

func deleteGCEDisk(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.Disk)

glog.V(2).Infof("Deleting GCE Disk %s", t.SelfLink)
Expand All @@ -420,7 +420,7 @@ func deleteGCEDisk(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.Disks.Delete(u.Project, u.Zone, u.Name).Do()
op, err := c.Compute().Disks.Delete(u.Project, u.Zone, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("disk not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -439,7 +439,7 @@ func (d *clusterDiscoveryGCE) listTargetPools() ([]*ResourceTracker, error) {

ctx := context.Background()

err := c.Compute.TargetPools.List(c.Project, c.Region).Pages(ctx, func(page *compute.TargetPoolList) error {
err := c.Compute().TargetPools.List(c.Project(), c.Region()).Pages(ctx, func(page *compute.TargetPoolList) error {
for _, tp := range page.Items {
if !d.matchesClusterName(tp.Name) {
continue
Expand Down Expand Up @@ -467,7 +467,7 @@ func (d *clusterDiscoveryGCE) listTargetPools() ([]*ResourceTracker, error) {
}

func deleteTargetPool(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.TargetPool)

glog.V(2).Infof("Deleting GCE TargetPool %s", t.SelfLink)
Expand All @@ -478,7 +478,7 @@ func deleteTargetPool(cloud fi.Cloud, r *ResourceTracker) error {

glog.Infof("TargetPool: %s", fi.DebugAsJsonString(t))

op, err := c.Compute.TargetPools.Delete(u.Project, u.Region, u.Name).Do()
op, err := c.Compute().TargetPools.Delete(u.Project, u.Region, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("TargetPool not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -497,7 +497,7 @@ func (d *clusterDiscoveryGCE) listForwardingRules() ([]*ResourceTracker, error)

ctx := context.Background()

err := c.Compute.ForwardingRules.List(c.Project, c.Region).Pages(ctx, func(page *compute.ForwardingRuleList) error {
err := c.Compute().ForwardingRules.List(c.Project(), c.Region()).Pages(ctx, func(page *compute.ForwardingRuleList) error {
for _, fr := range page.Items {
if !d.matchesClusterName(fr.Name) {
continue
Expand Down Expand Up @@ -532,7 +532,7 @@ func (d *clusterDiscoveryGCE) listForwardingRules() ([]*ResourceTracker, error)
}

func deleteForwardingRule(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.ForwardingRule)

glog.V(2).Infof("Deleting GCE ForwardingRule %s", t.SelfLink)
Expand All @@ -541,7 +541,7 @@ func deleteForwardingRule(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.ForwardingRules.Delete(u.Project, u.Region, u.Name).Do()
op, err := c.Compute().ForwardingRules.Delete(u.Project, u.Region, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("ForwardingRule not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -554,7 +554,7 @@ func deleteForwardingRule(cloud fi.Cloud, r *ResourceTracker) error {
}

func deleteManagedInstance(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
selfLink := r.obj.(string)

glog.V(2).Infof("Deleting GCE Instance %s", selfLink)
Expand All @@ -563,7 +563,7 @@ func deleteManagedInstance(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.Instances.Delete(u.Project, u.Zone, u.Name).Do()
op, err := c.Compute().Instances.Delete(u.Project, u.Zone, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("Instance not found, assuming deleted: %q", selfLink)
Expand Down Expand Up @@ -592,7 +592,7 @@ func (d *clusterDiscoveryGCE) listRoutes(resources map[string]*ResourceTracker)
ctx := context.Background()

// TODO: Push-down prefix?
err := c.Compute.Routes.List(c.Project).Pages(ctx, func(page *compute.RouteList) error {
err := c.Compute().Routes.List(c.Project()).Pages(ctx, func(page *compute.RouteList) error {
for _, r := range page.Items {
if !strings.HasPrefix(r.Name, prefix) {
continue
Expand Down Expand Up @@ -646,7 +646,7 @@ func (d *clusterDiscoveryGCE) listRoutes(resources map[string]*ResourceTracker)
}

func deleteRoute(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.Route)

glog.V(2).Infof("Deleting GCE Route %s", t.SelfLink)
Expand All @@ -655,7 +655,7 @@ func deleteRoute(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.Routes.Delete(u.Project, u.Name).Do()
op, err := c.Compute().Routes.Delete(u.Project, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("Route not found, assuming deleted: %q", t.SelfLink)
Expand All @@ -674,7 +674,7 @@ func (d *clusterDiscoveryGCE) listAddresses() ([]*ResourceTracker, error) {

ctx := context.Background()

err := c.Compute.Addresses.List(c.Project, c.Region).Pages(ctx, func(page *compute.AddressList) error {
err := c.Compute().Addresses.List(c.Project(), c.Region()).Pages(ctx, func(page *compute.AddressList) error {
for _, a := range page.Items {
if !d.matchesClusterName(a.Name) {
glog.V(8).Infof("Skipping Address with name %q", a.Name)
Expand Down Expand Up @@ -702,7 +702,7 @@ func (d *clusterDiscoveryGCE) listAddresses() ([]*ResourceTracker, error) {
}

func deleteAddress(cloud fi.Cloud, r *ResourceTracker) error {
c := cloud.(*gce.GCECloud)
c := cloud.(gce.GCECloud)
t := r.obj.(*compute.Address)

glog.V(2).Infof("Deleting GCE Address %s", t.SelfLink)
Expand All @@ -711,7 +711,7 @@ func deleteAddress(cloud fi.Cloud, r *ResourceTracker) error {
return err
}

op, err := c.Compute.Addresses.Delete(u.Project, u.Region, u.Name).Do()
op, err := c.Compute().Addresses.Delete(u.Project, u.Region, u.Name).Do()
if err != nil {
if gce.IsNotFound(err) {
glog.Infof("Address not found, assuming deleted: %q", t.SelfLink)
Expand Down
8 changes: 4 additions & 4 deletions upup/pkg/fi/cloudup/apply_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,9 @@ func (c *ApplyClusterCmd) Run() error {
switch kops.CloudProviderID(cluster.Spec.CloudProvider) {
case kops.CloudProviderGCE:
{
gceCloud := cloud.(*gce.GCECloud)
region = gceCloud.Region
project = gceCloud.Project
gceCloud := cloud.(gce.GCECloud)
region = gceCloud.Region()
project = gceCloud.Project()

if !AlphaAllowGCE.Enabled() {
return fmt.Errorf("GCE support is currently alpha, and is feature-gated. export KOPS_FEATURE_FLAGS=AlphaAllowGCE")
Expand Down Expand Up @@ -706,7 +706,7 @@ func (c *ApplyClusterCmd) Run() error {
case TargetDirect:
switch cluster.Spec.CloudProvider {
case "gce":
target = gce.NewGCEAPITarget(cloud.(*gce.GCECloud))
target = gce.NewGCEAPITarget(cloud.(gce.GCECloud))
case "aws":
target = awsup.NewAWSAPITarget(cloud.(awsup.AWSCloud))
case "digitalocean":
Expand Down
4 changes: 2 additions & 2 deletions upup/pkg/fi/cloudup/gce/gce_apitarget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
)

type GCEAPITarget struct {
Cloud *GCECloud
Cloud GCECloud
}

var _ fi.Target = &GCEAPITarget{}

func NewGCEAPITarget(cloud *GCECloud) *GCEAPITarget {
func NewGCEAPITarget(cloud GCECloud) *GCEAPITarget {
return &GCEAPITarget{
Cloud: cloud,
}
Expand Down
Loading