-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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 #10922 from rifelpet/automated-cherry-pick-of-#109…
…15-origin-release-1.20 Automated cherry pick of #10915: add support for azure public loadbalancer
- Loading branch information
Showing
11 changed files
with
552 additions
and
25 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
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,73 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package azure | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-06-01/network" | ||
| "github.com/Azure/go-autorest/autorest" | ||
| ) | ||
|
|
||
| // PublicIPAddressesClient is a client for public ip addresses. | ||
| type PublicIPAddressesClient interface { | ||
| CreateOrUpdate(ctx context.Context, resourceGroupName, publicIPAddressName string, parameters network.PublicIPAddress) error | ||
| List(ctx context.Context, resourceGroupName string) ([]network.PublicIPAddress, error) | ||
| Delete(ctx context.Context, resourceGroupName, publicIPAddressName string) error | ||
| } | ||
|
|
||
| type publicIPAddressesClientImpl struct { | ||
| c *network.PublicIPAddressesClient | ||
| } | ||
|
|
||
| var _ PublicIPAddressesClient = &publicIPAddressesClientImpl{} | ||
|
|
||
| func (c *publicIPAddressesClientImpl) CreateOrUpdate(ctx context.Context, resourceGroupName, publicIPAddressName string, parameters network.PublicIPAddress) error { | ||
| _, err := c.c.CreateOrUpdate(ctx, resourceGroupName, publicIPAddressName, parameters) | ||
| return err | ||
| } | ||
|
|
||
| func (c *publicIPAddressesClientImpl) List(ctx context.Context, resourceGroupName string) ([]network.PublicIPAddress, error) { | ||
| var l []network.PublicIPAddress | ||
| for iter, err := c.c.ListComplete(ctx, resourceGroupName); iter.NotDone(); err = iter.Next() { | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| l = append(l, iter.Value()) | ||
| } | ||
| return l, nil | ||
| } | ||
|
|
||
| func (c *publicIPAddressesClientImpl) Delete(ctx context.Context, resourceGroupName, publicIPAddressName string) error { | ||
| future, err := c.c.Delete(ctx, resourceGroupName, publicIPAddressName) | ||
| if err != nil { | ||
| return fmt.Errorf("error deleting public ip address: %s", err) | ||
| } | ||
| if err := future.WaitForCompletionRef(ctx, c.c.Client); err != nil { | ||
| return fmt.Errorf("error waiting for public ip address deletion completion: %s", err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func newPublicIPAddressesClientImpl(subscriptionID string, authorizer autorest.Authorizer) *publicIPAddressesClientImpl { | ||
| c := network.NewPublicIPAddressesClient(subscriptionID) | ||
| c.Authorizer = authorizer | ||
| return &publicIPAddressesClientImpl{ | ||
| c: &c, | ||
| } | ||
| } |
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,123 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package azuretasks | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2020-06-01/network" | ||
| "github.com/Azure/go-autorest/autorest/to" | ||
| "k8s.io/klog/v2" | ||
| "k8s.io/kops/upup/pkg/fi" | ||
| "k8s.io/kops/upup/pkg/fi/cloudup/azure" | ||
| ) | ||
|
|
||
| //go:generate fitask -type=PublicIPAddress | ||
|
|
||
| // PublicIPAddress is an Azure Cloud Public IP Address | ||
| type PublicIPAddress struct { | ||
| Name *string | ||
| Lifecycle *fi.Lifecycle | ||
| ResourceGroup *ResourceGroup | ||
|
|
||
| Tags map[string]*string | ||
| } | ||
|
|
||
| var _ fi.Task = &PublicIPAddress{} | ||
| var _ fi.CompareWithID = &PublicIPAddress{} | ||
|
|
||
| // CompareWithID returns the Name of the Public IP Address | ||
| func (p *PublicIPAddress) CompareWithID() *string { | ||
| return p.Name | ||
| } | ||
|
|
||
| // Find discovers the Public IP Address in the cloud provider | ||
| func (p *PublicIPAddress) Find(c *fi.Context) (*PublicIPAddress, error) { | ||
| cloud := c.Cloud.(azure.AzureCloud) | ||
| l, err := cloud.PublicIPAddress().List(context.TODO(), *p.ResourceGroup.Name) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var found *network.PublicIPAddress | ||
| for _, v := range l { | ||
| if *v.Name == *p.Name { | ||
| found = &v | ||
| break | ||
| } | ||
| } | ||
| if found == nil { | ||
| return nil, nil | ||
| } | ||
|
|
||
| return &PublicIPAddress{ | ||
| Name: p.Name, | ||
| Lifecycle: p.Lifecycle, | ||
| ResourceGroup: &ResourceGroup{ | ||
| Name: p.ResourceGroup.Name, | ||
| }, | ||
|
|
||
| Tags: found.Tags, | ||
| }, nil | ||
| } | ||
|
|
||
| // Run implements fi.Task.Run. | ||
| func (p *PublicIPAddress) Run(c *fi.Context) error { | ||
| c.Cloud.(azure.AzureCloud).AddClusterTags(p.Tags) | ||
| return fi.DefaultDeltaRunMethod(p, c) | ||
| } | ||
|
|
||
| // CheckChanges returns an error if a change is not allowed. | ||
| func (*PublicIPAddress) CheckChanges(a, e, changes *PublicIPAddress) error { | ||
| if a == nil { | ||
| // Check if required fields are set when a new resource is created. | ||
| if e.Name == nil { | ||
| return fi.RequiredField("Name") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // Check if unchanegable fields won't be changed. | ||
| if changes.Name != nil { | ||
| return fi.CannotChangeField("Name") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // RenderAzure creates or updates a Public IP Address. | ||
| func (*PublicIPAddress) RenderAzure(t *azure.AzureAPITarget, a, e, changes *PublicIPAddress) error { | ||
| if a == nil { | ||
| klog.Infof("Creating a new Public IP Address with name: %s", fi.StringValue(e.Name)) | ||
| } else { | ||
| klog.Infof("Updating a Public IP Address with name: %s", fi.StringValue(e.Name)) | ||
| } | ||
|
|
||
| p := network.PublicIPAddress{ | ||
| Location: to.StringPtr(t.Cloud.Region()), | ||
| Name: to.StringPtr(*e.Name), | ||
| PublicIPAddressPropertiesFormat: &network.PublicIPAddressPropertiesFormat{ | ||
| PublicIPAddressVersion: network.IPv4, | ||
| PublicIPAllocationMethod: network.Dynamic, | ||
| }, | ||
| Tags: e.Tags, | ||
| } | ||
|
|
||
| return t.Cloud.PublicIPAddress().CreateOrUpdate( | ||
| context.TODO(), | ||
| *e.ResourceGroup.Name, | ||
| *e.Name, | ||
| p) | ||
| } |
Oops, something went wrong.