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

Jump to bottom

Add initial support for the Azure instance metadata service. #48243

Merged
merged 1 commit into from
Jul 12, 2017
Merged

Add initial support for the Azure instance metadata service. #48243

merged 1 commit into from
Jul 12, 2017
+178 −0

Conversation

brendandburns
Copy link
Contributor

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 29, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Jun 29, 2017
@brendandburns brendandburns force-pushed the imds branch 2 times, most recently from e947923 to 75c580b Compare July 5, 2017 13:55
@brendandburns brendandburns added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Jul 5, 2017
@liggitt liggitt assigned colemickens and unassigned liggitt Jul 10, 2017
liggitt
liggitt reviewed Jul 10, 2017
View reviewed changes
pkg/cloudprovider/providers/azure/azure_instances.go
@@ -29,6 +29,16 @@ import (

// NodeAddresses returns the addresses of the specified instance.
func (az *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) {
if az.UseInstanceMetadata {
text, err := QueryMetadataText("instance/network/interface/0/ipv4/ipAddress/0/privateIpAddress")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this errors, should it fall back to the previous API calls or return an error?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the "where possible" language in the config option is squishy, so I wasn't sure

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where possible was meant to mean: "where the metadata service provides the information" as opposed to "fallback if there are errors"

We don't fallback in other places where we use other metadata services:

https://github.com/kubernetes/kubernetes/blob/master/pkg/cloudprovider/providers/aws/aws.go#L779

So I think we probably don't want to here, either.

@slack
Copy link

slack commented Jul 12, 2017

/sig azure

@colemickens
Copy link
Contributor

LGTM, but out of curiosity, why implement the various networking structs if the only usage of the IMDS is to directly grab the relevant ipv4 needed and you never actually use/deserialize the containing structs?

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, colemickens

Associated issue: 46632

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@brendandburns
Copy link
Contributor Author

I'm going to pull more eventually...

(also eventually, I'll fork it out as it's own library)

@brendandburns brendandburns added this to the v1.8 milestone Jul 12, 2017
rootfs
rootfs reviewed Jul 12, 2017
View reviewed changes
pkg/cloudprovider/providers/azure/azure_instance_metadata.go
@@ -0,0 +1,103 @@
/*
Copyright 2016 The Kubernetes Authors.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2017

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48594, 47042, 48801, 48641, 48243)

@k8s-github-robot k8s-github-robot merged commit d230956 into kubernetes:master Jul 12, 2017
@jdumars jdumars mentioned this pull request Dec 26, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rootfs rootfs rootfs left review comments

@liggitt liggitt liggitt left review comments

Assignees

@colemickens colemickens

@dchen1107 dchen1107

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.
8 participants
@brendandburns @slack @colemickens @k8s-github-robot @liggitt @rootfs @dchen1107 @k8s-ci-robot