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.

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

fix azure disk storage account init issue #55927

Merged
merged 2 commits into from Nov 18, 2017

Conversation

@andyzhangx
Copy link
Member

andyzhangx commented Nov 17, 2017

What this PR does / why we need it:
There are two issues for the original azure disk storage account initialaztion code:

  1. wrong controller-master detection, see issue #54570, #55776
  2. should not initialize two storage account even if it's not necessary, see issue #50883

This PR would fix the above two issues:
For 1: remove the controller-master process binding
For 2: remove the storage account initialization process, just create on demand

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #54570
Fixes #55776
Fixes #50883

Special notes for your reviewer:
@rootfs @karataliu

Release note:

fix azure disk storage account init issue

/sig azure

@@ -330,41 +325,6 @@ func (c *BlobDiskController) init() error {
}
c.accounts = accounts

if len(c.accounts) == 0 {

This comment has been minimized.

Copy link
@karataliu

karataliu Nov 17, 2017

Contributor

Also update comment lines before init method

This comment has been minimized.

Copy link
@andyzhangx

andyzhangx Nov 17, 2017

Author Member

fixed

@@ -543,13 +503,7 @@ func (c *BlobDiskController) getDiskCount(SAName string) (int, error) {
// and we only do that in the controller

func (c *BlobDiskController) shouldInit() bool {

This comment has been minimized.

Copy link
@karataliu

karataliu Nov 17, 2017

Contributor

not needed?

This comment has been minimized.

Copy link
@andyzhangx

andyzhangx Nov 17, 2017

Author Member

init() func removed

remove init func

allow getStorageAccounts failed
@andyzhangx andyzhangx force-pushed the andyzhangx:init-storageaccount branch from 00d1df8 to 3d60d18 Nov 17, 2017
@rootfs

This comment has been minimized.

Copy link
Member

rootfs commented Nov 17, 2017

/approve
/lgtm

@andyzhangx

This comment has been minimized.

Copy link
Member Author

andyzhangx commented Nov 17, 2017

/assign @jdumars

@jdumars

This comment has been minimized.

Copy link
Member

jdumars commented Nov 17, 2017

/approve

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Nov 17, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, jdumars, rootfs

Associated issue: 54570

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

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Nov 18, 2017

Automatic merge from submit-queue (batch tested with PRs 55233, 55927, 55903, 54867, 55940). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit e8df004 into kubernetes:master Nov 18, 2017
13 checks passed
13 checks passed
Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation andyzhangx authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke-gci Skipped
pull-kubernetes-e2e-kops-aws Jenkins job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Jenkins job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-unit Jenkins job succeeded.
Details
pull-kubernetes-verify Jenkins job succeeded.
Details
k8s-github-robot pushed a commit that referenced this pull request Dec 17, 2017
Kubernetes Submit Queue
…5927-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #55927

Cherry pick of #55927 on release-1.8.

#55927: move InitStorageAccount into azure disk provision func
k8s-github-robot pushed a commit that referenced this pull request Dec 28, 2017
Kubernetes Submit Queue
…5927-upstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #55927

Cherry pick of #55927 on release-1.7.

#55927: move InitStorageAccount into azure disk provision func
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.