-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2806 from panslava/mp-integration-test
ProviderConfig fixes and integration test
- Loading branch information
Showing
11 changed files
with
874 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package gce | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud" | ||
| "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta" | ||
| compute "google.golang.org/api/compute/v1" | ||
| cloudgce "k8s.io/cloud-provider-gcp/providers/gce" | ||
| v1 "k8s.io/ingress-gce/pkg/apis/providerconfig/v1" | ||
| "k8s.io/ingress-gce/pkg/test" | ||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| type GCEFake struct { | ||
| defaultTestClusterValues cloudgce.TestClusterValues | ||
| clientsForProviderConfigs map[string]*cloudgce.Cloud | ||
| } | ||
|
|
||
| func NewGCEFake() *GCEFake { | ||
| return &GCEFake{ | ||
| defaultTestClusterValues: cloudgce.DefaultTestClusterValues(), | ||
| clientsForProviderConfigs: make(map[string]*cloudgce.Cloud), | ||
| } | ||
| } | ||
|
|
||
| func providerConfigKey(providerConfig *v1.ProviderConfig) string { | ||
| return fmt.Sprintf("%s/%s", providerConfig.Namespace, providerConfig.Name) | ||
| } | ||
|
|
||
| // GCEForProviderConfig returns a new Fake GCE client for the given provider config. | ||
| // It stores the client in the GCEFake and returns it if the same provider config is requested again. | ||
| func (g *GCEFake) GCEForProviderConfig(providerConfig *v1.ProviderConfig, logger klog.Logger) (*cloudgce.Cloud, error) { | ||
| pcKey := providerConfigKey(providerConfig) | ||
| if g.clientsForProviderConfigs[pcKey] != nil { | ||
| return g.clientsForProviderConfigs[pcKey], nil | ||
| } | ||
|
|
||
| // Copy the default test cluster values | ||
| updatedConfig := g.defaultTestClusterValues | ||
| updatedConfig.ProjectID = providerConfig.Spec.ProjectID | ||
| updatedConfig.NetworkURL = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/networks/%s", providerConfig.Spec.ProjectID, providerConfig.Spec.NetworkConfig.Network) | ||
| updatedConfig.SubnetworkURL = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/regions/%s/subnetworks/%s", providerConfig.Spec.ProjectID, updatedConfig.Region, providerConfig.Spec.NetworkConfig.DefaultSubnetwork) | ||
| logger.Info("Creating GCEFake for provider config", "providerConfig", providerConfig.Name, "updatedConfig", updatedConfig) | ||
| fakeCloud := cloudgce.NewFakeGCECloud(updatedConfig) | ||
| _, err := createNetwork(fakeCloud, providerConfig.Spec.NetworkConfig.Network) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| _, err = createSubnetwork(fakeCloud, providerConfig.Spec.NetworkConfig.DefaultSubnetwork, providerConfig.Spec.NetworkConfig.Network) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if err := createAndInsertNodes(fakeCloud, []string{"test-node-1"}, updatedConfig.ZoneName); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| g.clientsForProviderConfigs[pcKey] = fakeCloud | ||
| return fakeCloud, nil | ||
| } | ||
|
|
||
| func createAndInsertNodes(cloud *cloudgce.Cloud, nodeNames []string, zone string) error { | ||
| if _, err := test.CreateAndInsertNodes(cloud, nodeNames, zone); err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func createNetwork(c *cloudgce.Cloud, networkName string) (*compute.Network, error) { | ||
| ctx, cancel := cloud.ContextWithCallTimeout() | ||
| defer cancel() | ||
|
|
||
| key := meta.GlobalKey(networkName) | ||
| err := c.Compute().Networks().Insert(ctx, key, &compute.Network{Name: networkName}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| network, err := c.Compute().Networks().Get(ctx, key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return network, nil | ||
| } | ||
|
|
||
| func createSubnetwork(c *cloudgce.Cloud, subnetworkName string, networkName string) (*compute.Subnetwork, error) { | ||
| ctx, cancel := cloud.ContextWithCallTimeout() | ||
| defer cancel() | ||
|
|
||
| key := meta.GlobalKey(subnetworkName) | ||
| err := c.Compute().Subnetworks().Insert(ctx, key, &compute.Subnetwork{Name: subnetworkName, Network: networkName}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| subnetwork, err := c.Compute().Subnetworks().Get(ctx, key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return subnetwork, nil | ||
| } | ||
|
|
||
| // assert that the GCEFake implements the GCECreator interface | ||
| var _ GCECreator = &GCEFake{} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package gce | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| v1 "k8s.io/ingress-gce/pkg/apis/providerconfig/v1" | ||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| func TestNewGCEForProviderConfig(t *testing.T) { | ||
| fake := NewGCEFake() | ||
|
|
||
| providerConfig := &v1.ProviderConfig{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "test-config", | ||
| }, | ||
| Spec: v1.ProviderConfigSpec{ | ||
| ProjectID: "custom-project-id", | ||
| NetworkConfig: &v1.NetworkConfig{ | ||
| Network: "custom-network", | ||
| DefaultSubnetwork: "custom-subnetwork", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| logger := klog.TODO() | ||
| cloud, err := fake.GCEForProviderConfig(providerConfig, logger) | ||
| if err != nil { | ||
| t.Fatalf("expected no error, got %v", err) | ||
| } | ||
| if cloud == nil { | ||
| t.Fatal("expected cloud instance, got nil") | ||
| } | ||
| if cloud.ProjectID() != providerConfig.Spec.ProjectID { | ||
| t.Errorf("expected project id %q, got %q", providerConfig.Spec.ProjectID, cloud.ProjectID()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.