implement InstanceShutdownByProviderID for azure #68033

yastij · 2018-08-29T22:40:24Z

What this PR does / why we need it: implements #66265

Which issue(s) this PR fixes: Fixes #66265

Special notes for your reviewer:

Release note:

Support NodeShutdown taint for azure

yastij · 2018-08-29T22:41:46Z

/assign @feiskyer @andyzhangx

can you add this to the 1.12 milestone ?

cc @saad-ali @jingxu97 @gnufied @zetaab

yastij · 2018-08-29T22:42:10Z

/sig azure

andyzhangx

/lgtm

feiskyer

This doesn't work for vmss nodes and doesn't use caches which helps to reduces ARM API calls.

Could you add VMSS nodes support and use caches to get provisioning state? e.g. use getVmssVM() for VMSS and getVirtualMachine() for VMAS.

feiskyer · 2018-08-30T04:42:31Z

/lgtm cancel

feiskyer · 2018-09-04T01:23:37Z

pkg/cloudprovider/providers/azure/azure_instances.go

-	return false, cloudprovider.NotImplemented
+
+	nodeName, err := az.vmSet.GetNodeNameByProviderID(providerID)
+


nit: remove empty lines before if err != nil.

same below

feiskyer · 2018-09-04T01:23:50Z

pkg/cloudprovider/providers/azure/azure_fakes.go

+func (f *fakeVMSet) GetProvisioningStateByNodeName(name string) (string, error) {
+	return "", fmt.Errorf("unimplemented")
+}
+


please gofmt this file

andyzhangx · 2018-09-04T05:26:34Z

pkg/cloudprovider/providers/azure/azure_instances.go

+		return false, err
+	}
+
+	return provisioningState == "Stopped" || provisioningState == "Deallocated", nil


I would suggest all using lower case to do string comparison, to prevent case change in the future.

andyzhangx · 2018-09-04T05:26:59Z

pkg/cloudprovider/providers/azure/azure_standard.go

@@ -346,6 +346,17 @@ func (as *availabilitySet) GetInstanceIDByNodeName(name string) (string, error)
 	return *machine.ID, nil
 }

+func (as *availabilitySet) GetProvisioningStateByNodeName(name string) (provisioningState string, err error) {
+


pls remove unncessary empty lines

yastij · 2018-09-04T20:04:29Z

@feiskyer @andyzhangx - fixe PTAL so we can ship this for 1.12, Thanks !

yastij · 2018-09-04T20:58:45Z

/retest pull-kubernetes-e2e-kops-aws

andyzhangx · 2018-09-05T00:10:42Z

pkg/cloudprovider/providers/azure/azure_standard.go

@@ -346,6 +346,16 @@ func (as *availabilitySet) GetInstanceIDByNodeName(name string) (string, error)
 	return *machine.ID, nil
 }

+func (as *availabilitySet) GetProvisioningStateByNodeName(name string) (provisioningState string, err error) {
+	vm, err := as.getVirtualMachine(types.NodeName(name))
+


remove this line

andyzhangx · 2018-09-05T00:10:49Z

pkg/cloudprovider/providers/azure/azure_vmss.go

@@ -128,6 +128,18 @@ func (ss *scaleSet) getVmssVM(nodeName string) (ssName, instanceID string, vm co
 	return ssName, instanceID, *(cachedVM.(*compute.VirtualMachineScaleSetVM)), nil
 }

+func (ss *scaleSet) GetProvisioningStateByNodeName(name string) (provisioningState string, err error) {
+


remove this line

andyzhangx · 2018-09-05T00:10:54Z

pkg/cloudprovider/providers/azure/azure_vmss.go

+func (ss *scaleSet) GetProvisioningStateByNodeName(name string) (provisioningState string, err error) {
+
+	_, _, vm, err := ss.getVmssVM(name)
+


remove this line

andyzhangx · 2018-09-05T00:11:00Z

pkg/cloudprovider/providers/azure/azure_vmss.go

+	}
+
+	return *vm.ProvisioningState, nil
+


remove this line

feiskyer

LGTM now, please remove the unnecessary empty lines.

feiskyer · 2018-09-05T02:47:58Z

/milestone v1.12

feiskyer · 2018-09-07T23:40:32Z

/lgtm
/retest

k8s-ci-robot · 2018-09-07T23:40:38Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, feiskyer, yastij

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~pkg/cloudprovider/providers/azure/OWNERS~~ [andyzhangx,feiskyer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

yastij · 2018-09-08T16:38:17Z

/priority critical-urgent

k8s-github-robot · 2018-09-08T16:39:56Z

/test all [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2018-09-08T17:43:33Z

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

k8s-ci-robot requested review from feiskyer and khenidak August 29, 2018 22:40

k8s-ci-robot assigned andyzhangx and feiskyer Aug 29, 2018

k8s-ci-robot added the sig/azure label Aug 29, 2018

yastij mentioned this pull request Aug 29, 2018

add detach logic for node shutdown taint #67977

Closed

andyzhangx approved these changes Aug 30, 2018

View reviewed changes

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 30, 2018

feiskyer suggested changes Aug 30, 2018

View reviewed changes

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 30, 2018

zetaab mentioned this pull request Sep 3, 2018

If kubelet is unavailable, AttachDetachController fails to force detach on pod deletion #65392

Closed

yastij force-pushed the instanceShutdown-azure branch from 35edff3 to 023bed5 Compare September 3, 2018 20:53

k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 3, 2018

yastij force-pushed the instanceShutdown-azure branch 2 times, most recently from 2ee943b to 1752278 Compare September 3, 2018 21:09

feiskyer reviewed Sep 4, 2018

View reviewed changes

andyzhangx reviewed Sep 4, 2018

View reviewed changes

yastij force-pushed the instanceShutdown-azure branch from 1752278 to 7ecde43 Compare September 4, 2018 19:47

yastij force-pushed the instanceShutdown-azure branch from 7ecde43 to 5586108 Compare September 4, 2018 19:55

andyzhangx reviewed Sep 5, 2018

View reviewed changes

feiskyer approved these changes Sep 5, 2018

View reviewed changes

k8s-ci-robot added this to the v1.12 milestone Sep 5, 2018

implement InstanceShutdownByProviderID for azure

0048b0e

yastij force-pushed the instanceShutdown-azure branch from 5586108 to 0048b0e Compare September 7, 2018 19:11

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 7, 2018

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 8, 2018

k8s-ci-robot added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Sep 8, 2018

k8s-github-robot merged commit 10bde50 into kubernetes:master Sep 8, 2018

yastij deleted the instanceShutdown-azure branch September 8, 2018 18:38

marpaia mentioned this pull request Sep 20, 2018

Include SIG headers in the duplicate notes section marpaia/release-notes#6

Merged

feiskyer mentioned this pull request Sep 21, 2018

Fix nodes power state on Azure #68921

Merged

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

implement InstanceShutdownByProviderID for azure #68033

implement InstanceShutdownByProviderID for azure #68033

yastij commented Aug 29, 2018 •

edited

Loading

yastij commented Aug 29, 2018 •

edited

Loading

yastij commented Aug 29, 2018

andyzhangx left a comment

feiskyer left a comment

feiskyer commented Aug 30, 2018

feiskyer Sep 4, 2018

feiskyer Sep 4, 2018

andyzhangx Sep 4, 2018

andyzhangx Sep 4, 2018

yastij commented Sep 4, 2018

yastij commented Sep 4, 2018

andyzhangx Sep 5, 2018

andyzhangx Sep 5, 2018

andyzhangx Sep 5, 2018

andyzhangx Sep 5, 2018

feiskyer left a comment

feiskyer commented Sep 5, 2018

feiskyer commented Sep 7, 2018

k8s-ci-robot commented Sep 7, 2018

yastij commented Sep 8, 2018

k8s-github-robot commented Sep 8, 2018

k8s-github-robot commented Sep 8, 2018

		return false, cloudprovider.NotImplemented

		nodeName, err := az.vmSet.GetNodeNameByProviderID(providerID)

		func (ss *scaleSet) GetProvisioningStateByNodeName(name string) (provisioningState string, err error) {

		_, _, vm, err := ss.getVmssVM(name)

implement InstanceShutdownByProviderID for azure #68033

implement InstanceShutdownByProviderID for azure #68033

Conversation

yastij commented Aug 29, 2018 • edited Loading

yastij commented Aug 29, 2018 • edited Loading

yastij commented Aug 29, 2018

andyzhangx left a comment

Choose a reason for hiding this comment

feiskyer left a comment

Choose a reason for hiding this comment

feiskyer commented Aug 30, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yastij commented Sep 4, 2018

yastij commented Sep 4, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

feiskyer left a comment

Choose a reason for hiding this comment

feiskyer commented Sep 5, 2018

feiskyer commented Sep 7, 2018

k8s-ci-robot commented Sep 7, 2018

yastij commented Sep 8, 2018

k8s-github-robot commented Sep 8, 2018

k8s-github-robot commented Sep 8, 2018

yastij commented Aug 29, 2018 •

edited

Loading

yastij commented Aug 29, 2018 •

edited

Loading