-
Notifications
You must be signed in to change notification settings - Fork 4.6k
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
azure: Add support for dns=none #15627
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
83d14d4
azure: Add support for dns=none
hakman ecbcd7a
aws: Add more DNS pre-creation tests
hakman 15b44ba
azure: Remove permissions for nodes when dns=none
hakman 576ef5e
azure: Verify VM ID when registering nodes
hakman 8094432
azure: Allow full load balancer access only when public
hakman 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 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
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,109 @@ | ||
| /* | ||
| Copyright 2022 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 ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "k8s.io/kops/pkg/bootstrap" | ||
| ) | ||
|
|
||
| const AzureAuthenticationTokenPrefix = "x-azure-id " | ||
|
|
||
| type azureAuthenticator struct { | ||
| } | ||
|
|
||
| var _ bootstrap.Authenticator = &azureAuthenticator{} | ||
|
|
||
| func NewAzureAuthenticator() (bootstrap.Authenticator, error) { | ||
| return &azureAuthenticator{}, nil | ||
| } | ||
|
|
||
| func (h *azureAuthenticator) CreateToken(body []byte) (string, error) { | ||
| m, err := queryInstanceMetadata() | ||
| if err != nil { | ||
| return "", fmt.Errorf("querying instance metadata: %w", err) | ||
| } | ||
|
|
||
| vmId := m.Compute.VMID | ||
| if vmId == "" { | ||
| return "", fmt.Errorf("missing virtual machine ID") | ||
| } | ||
|
|
||
| // The fully qualified VMSS VM resource ID format is: | ||
| // /subscriptions/SUBSCRIPTION_ID/resourceGroups/RESOURCE_GROUP_NAME/providers/Microsoft.Compute/virtualMachineScaleSets/VMSS_NAME/virtualMachines/VMSS_INDEX | ||
| r := strings.Split(m.Compute.ResourceID, "/") | ||
| if len(r) != 11 || r[7] != "virtualMachineScaleSets" || r[9] != "virtualMachines" { | ||
| return "", fmt.Errorf("unexpected resource ID format: %q", m.Compute.ResourceID) | ||
| } | ||
| vmssName := r[8] | ||
| vmssIndex := r[10] | ||
|
|
||
| return AzureAuthenticationTokenPrefix + vmId + " " + vmssName + " " + vmssIndex, nil | ||
| } | ||
|
|
||
| type instanceComputeMetadata struct { | ||
| ResourceGroupName string `json:"resourceGroupName"` | ||
| ResourceID string `json:"resourceId"` | ||
| SubscriptionID string `json:"subscriptionId"` | ||
| VMID string `json:"vmId"` | ||
| } | ||
|
|
||
| type instanceMetadata struct { | ||
| Compute *instanceComputeMetadata `json:"compute"` | ||
| } | ||
|
|
||
| // queryInstanceMetadata queries Azure Instance Metadata Service (IMDS) | ||
| // https://learn.microsoft.com/en-us/azure/virtual-machines/instance-metadata-service?tabs=linux | ||
| func queryInstanceMetadata() (*instanceMetadata, error) { | ||
| transport := &http.Transport{Proxy: nil} | ||
|
|
||
| client := http.Client{Transport: transport} | ||
|
|
||
| req, err := http.NewRequest("GET", "http://169.254.169.254/metadata/instance", nil) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("creating a new request: %w", err) | ||
| } | ||
| req.Header.Add("Metadata", "True") | ||
|
|
||
| q := req.URL.Query() | ||
| q.Add("format", "json") | ||
| q.Add("api-version", "2021-02-01") | ||
| req.URL.RawQuery = q.Encode() | ||
|
|
||
| resp, err := client.Do(req) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("sending request to the instance metadata server: %w", err) | ||
| } | ||
|
|
||
| defer resp.Body.Close() | ||
| body, err := io.ReadAll(resp.Body) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("reading a response from the metadata server: %w", err) | ||
| } | ||
| metadata := &instanceMetadata{} | ||
| err = json.Unmarshal(body, metadata) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unmarshalling instance metadata: %w", err) | ||
| } | ||
|
|
||
| return metadata, nil | ||
| } |
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.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 👍 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll take on removing the dead code this leaves behind.