-
Notifications
You must be signed in to change notification settings - Fork 470
Add Linux VM and VMSS extensions #1107
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.
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
Merged
k8s-ci-robot
merged 1 commit into
kubernetes-sigs:master
from
CecileRobertMichon:linux-extension
Jan 25, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,86 @@ | ||
| /* | ||
| Copyright 2021 The Kubernetes Authors. | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ❗ |
||
|
|
||
| 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 vmextensions | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute" | ||
| "github.com/Azure/go-autorest/autorest" | ||
| azure "sigs.k8s.io/cluster-api-provider-azure/cloud" | ||
| "sigs.k8s.io/cluster-api-provider-azure/util/tele" | ||
| ) | ||
|
|
||
| // Client wraps go-sdk | ||
| type client interface { | ||
| CreateOrUpdate(context.Context, string, string, string, compute.VirtualMachineExtension) error | ||
| Delete(context.Context, string, string, string) error | ||
| } | ||
|
|
||
| // AzureClient contains the Azure go-sdk Client | ||
| type azureClient struct { | ||
| vmextensions compute.VirtualMachineExtensionsClient | ||
| } | ||
|
|
||
| var _ client = (*azureClient)(nil) | ||
|
|
||
| // newClient creates a new VM client from subscription ID. | ||
| func newClient(auth azure.Authorizer) *azureClient { | ||
| c := newVirtualMachineExtensionsClient(auth.SubscriptionID(), auth.BaseURI(), auth.Authorizer()) | ||
| return &azureClient{c} | ||
| } | ||
|
|
||
| // newVirtualMachineExtensionsClient creates a new vm extension client from subscription ID. | ||
| func newVirtualMachineExtensionsClient(subscriptionID string, baseURI string, authorizer autorest.Authorizer) compute.VirtualMachineExtensionsClient { | ||
| vmextensionsClient := compute.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID) | ||
| azure.SetAutoRestClientDefaults(&vmextensionsClient.Client, authorizer) | ||
| return vmextensionsClient | ||
| } | ||
|
|
||
| // CreateOrUpdate creates or updates the virtual machine extension | ||
| func (ac *azureClient) CreateOrUpdate(ctx context.Context, resourceGroupName, vmName, name string, parameters compute.VirtualMachineExtension) error { | ||
| ctx, span := tele.Tracer().Start(ctx, "vmextensions.AzureClient.CreateOrUpdate") | ||
| defer span.End() | ||
|
|
||
| future, err := ac.vmextensions.CreateOrUpdate(ctx, resourceGroupName, vmName, name, parameters) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = future.WaitForCompletionRef(ctx, ac.vmextensions.Client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = future.Result(ac.vmextensions) | ||
| return err | ||
| } | ||
|
|
||
| // Delete removes the virtual machine extension. | ||
| func (ac *azureClient) Delete(ctx context.Context, resourceGroupName, vmName, name string) error { | ||
| ctx, span := tele.Tracer().Start(ctx, "vmextensions.AzureClient.Delete") | ||
| defer span.End() | ||
|
|
||
| future, err := ac.vmextensions.Delete(ctx, resourceGroupName, vmName, name) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| err = future.WaitForCompletionRef(ctx, ac.vmextensions.Client) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| _, err = future.Result(ac.vmextensions) | ||
| return err | ||
| } | ||
79 changes: 79 additions & 0 deletions
79
cloud/services/vmextensions/mock_vmextensions/client_mock.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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,22 @@ | ||
| /* | ||
| Copyright 2021 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. | ||
| */ | ||
|
|
||
| // Run go generate to regenerate this mock. | ||
| //go:generate ../../../../hack/tools/bin/mockgen -destination client_mock.go -package mock_vmextensions -source ../client.go Client | ||
| //go:generate ../../../../hack/tools/bin/mockgen -destination vmextensions_mock.go -package mock_vmextensions -source ../vmextensions.go VMExtensionScope | ||
| //go:generate /usr/bin/env bash -c "cat ../../../../hack/boilerplate/boilerplate.generatego.txt client_mock.go > _client_mock.go && mv _client_mock.go client_mock.go" | ||
| //go:generate /usr/bin/env bash -c "cat ../../../../hack/boilerplate/boilerplate.generatego.txt vmextensions_mock.go > _vmextensions_mock.go && mv _vmextensions_mock.go vmextensions_mock.go" | ||
| package mock_vmextensions //nolint |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.