Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

change flexvolume plugin dir to /etc/kubernetes/volumeplugins in Linux #1991

Merged
merged 1 commit into from
Jan 8, 2018

Conversation

andyzhangx
Copy link
Contributor

@andyzhangx andyzhangx commented Jan 4, 2018

What this PR does / why we need it:
change default flexvolume plugin dir to /etc/kubernetes/volumeplugins in Linux since original default flexvolume plugin dir /usr/libexec/kubernetes/kubelet-plugins does not work in coreos according to #1957

(in Windows, the plugin dir would be c:\k\volumeplugins)

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #1957

Special notes for your reviewer:
@jackfrancis @JiangtianLi @mwieczorek @IvanovOleg

Release note:

change flexvolume plugin dir to /etc/kubernetes/volumeplugins in Linux

JiangtianLi
JiangtianLi previously approved these changes Jan 4, 2018
Copy link
Contributor

@JiangtianLi JiangtianLi left a comment

Choose a reason for hiding this comment

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

lgtm

@jackfrancis
Copy link
Member

@andyzhangx just merged the Windows flex volume PR, so you'll need to rebase this one :)

@andyzhangx
Copy link
Contributor Author

@JiangtianLi confilict resolved

@@ -30,14 +30,15 @@ ExecStart=/usr/bin/docker run \
--volume=/etc/kubernetes/:/etc/kubernetes:ro \
--volume=/srv/kubernetes/:/srv/kubernetes:ro $DOCKER_OPTS \
--volume=/var/lib/waagent/ManagedIdentity-Settings:/var/lib/waagent/ManagedIdentity-Settings:ro \
--volume=/usr/libexec/kubernetes/kubelet-plugins:/usr/libexec/kubernetes/kubelet-plugins:rw \
--volume=/etc/kubernetes/volumeplugins:/etc/kubernetes/volumeplugins:rw \
Copy link
Contributor

Choose a reason for hiding this comment

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

does this need to be done for the 1.5 kuberneteskubelet.service as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

(I mean in parts/k8s/artifacts/1.5/kuberneteskubelet.service)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@anhowe k8s 1.5 does not support flexvolume, so it's not necessary

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

lgtm

@andyzhangx
Copy link
Contributor Author

@jackfrancis ci/circleci: k8s-windows-1.7-release-e2e failed, while this PR is not related to windows setting.

@andyzhangx
Copy link
Contributor Author

/retest

@JiangtianLi
Copy link
Contributor

It seems the test suite has kicked off but there is no log of any spec. It is weird that hybrid 1.7 test passed, which uses the same v1.7.12-1int.zip. Seems to me the test suite is stuck right after AnnounceNumberOfSpecs?

@jackfrancis
Copy link
Member

Will merge, overlooking flaky Windows E2E runs for this PR. Thanks again @andyzhangx !

@jackfrancis jackfrancis merged commit ea30e1c into Azure:master Jan 8, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Kubernetes CoreOS failed to start kubelet
4 participants